From 573532df7f07a95a0a2b8bad3308a82b77b8427b Mon Sep 17 00:00:00 2001 From: Andre Vieira Date: Wed, 5 Aug 2015 13:22:43 +0100 Subject: [PATCH] Use machine header file for param configuration. On 31/07/15 10:34, Richard Earnshaw wrote: > On 31/07/15 10:28, Andre Vieira wrote: >> newlib/ChangeLog: >> 2015-07-28 Andre Vieira >> >> * libc/sys/arm/sys/param.h: Include machine/param.h >> (HZ, NOFILE, PATHSIZE): Define. >> >> param_refactor_1.patch >> >> >> From abc2d5f3398721f6ca891b9581feaba58730b19c Mon Sep 17 00:00:00 2001 >> From: Andre Simoes Dias Vieira >> Date: Tue, 28 Jul 2015 12:10:59 +0100 >> Subject: [PATCH 1/2] Moved param configuration to machine/param.h >> >> --- >> newlib/libc/sys/arm/sys/param.h | 12 ++++++++++-- >> 1 file changed, 10 insertions(+), 2 deletions(-) >> >> diff --git a/newlib/libc/sys/arm/sys/param.h b/newlib/libc/sys/arm/sys/param.h >> index adc066e9a8756e07edaaa8cadc79b5f05c996ac9..622c371972ab3c9dbb93ea5c51323a593e2a171a 100644 >> --- a/newlib/libc/sys/arm/sys/param.h >> +++ b/newlib/libc/sys/arm/sys/param.h >> @@ -3,9 +3,17 @@ >> #ifndef _SYS_PARAM_H >> # define _SYS_PARAM_H >> >> -# define HZ (100) >> -# define NOFILE (60) >> +#include >> + >> +#ifndef HZ >> +# define HZ (60) > > Why have you changed the value for HZ? It seems that, by convention, > ARM boards have always used 100. > > R. > >> +#endif >> +#ifndef NOFILE >> +# define NOFILE>(60) >> +#endif >> +#ifndef PATHSIZE >> # define PATHSIZE (1024) >> +#endif >> >> #define BIG_ENDIAN 4321 >> #define LITTLE_ENDIAN 1234 >> > Hi Richard, ARM's machine/param.h that is included in "#include ", before the 'ifndef' already defines HZ to be 100. This file was already there, it was just not being used. I understand that this 'ifndef' might be confusing, though I decided to add it to mimic the behavior of the default sys/param.h. There is however an unrelated issue with this patch, a typo in the "#define NOFILE" that crept in there due to some copy pasting when splitting the patch. Here is a fixed version. BR, Andre newlib/ChangeLog: 2015-07-28 Andre Vieira * libc/sys/arm/sys/param.h: Include machine/param.h (HZ, NOFILE, PATHSIZE): Define. From abc2d5f3398721f6ca891b9581feaba58730b19c Mon Sep 17 00:00:00 2001 From: Andre Simoes Dias Vieira Date: Tue, 28 Jul 2015 12:10:59 +0100 Subject: [PATCH 1/2] Moved param configuration to machine/param.h --- newlib/libc/sys/arm/sys/param.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/newlib/libc/sys/arm/sys/param.h b/newlib/libc/sys/arm/sys/param.h index adc066e9a..9791d721f 100644 --- a/newlib/libc/sys/arm/sys/param.h +++ b/newlib/libc/sys/arm/sys/param.h @@ -3,9 +3,17 @@ #ifndef _SYS_PARAM_H # define _SYS_PARAM_H -# define HZ (100) -# define NOFILE (60) +#include + +#ifndef HZ +# define HZ (60) +#endif +#ifndef NOFILE +# define NOFILE (60) +#endif +#ifndef PATHSIZE # define PATHSIZE (1024) +#endif #define BIG_ENDIAN 4321 #define LITTLE_ENDIAN 1234