From a0181ea03605b1fafe2ec9882384b91655dfe1c2 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 31 Oct 2007 22:26:51 +0000 Subject: [PATCH] Use the preferred order of 'static const' instead of 'const static'. This is the common style in both Linux as well as in LinuxBIOS. Self-ack as this is pretty trivial and a similar patch was already acked. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2923 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/amd/model_fxx/fidvid.c | 2 +- src/northbridge/amd/amdk8/raminit_f_dqs.c | 12 ++++++------ src/superio/smsc/smscsuperio/superio.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cpu/amd/model_fxx/fidvid.c b/src/cpu/amd/model_fxx/fidvid.c index 7b6c415893..e35b5fc543 100644 --- a/src/cpu/amd/model_fxx/fidvid.c +++ b/src/cpu/amd/model_fxx/fidvid.c @@ -99,7 +99,7 @@ static unsigned set_fidvid_without_init(unsigned fidvid) static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage) { //for (cur, new) there is one <1600MHz x8 to find out next_fid - const static uint8_t next_fid_a[] = { + static const uint8_t next_fid_a[] = { /* x4 x5 x6 x7 x8 x9 x10 x11 x12 x13 x14 x15 */ // 0:x4, 2:x5....BASE=4, MIN=4, MAX=25, INC=2 result = (xX-BASE)*INC /* x4 */ 0, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, /* x5 */ 9, 0, 11, 11, 9, 9, 10, 11, 11, 11, 11, 11, diff --git a/src/northbridge/amd/amdk8/raminit_f_dqs.c b/src/northbridge/amd/amdk8/raminit_f_dqs.c index 9f7ac72303..757acba7d7 100644 --- a/src/northbridge/amd/amdk8/raminit_f_dqs.c +++ b/src/northbridge/amd/amdk8/raminit_f_dqs.c @@ -396,7 +396,7 @@ static void ResetDCTWrPtr(const struct mem_controller *ctrl) static uint16_t get_exact_T1000(unsigned i) { // 200 266, 333, 400 - const static uint16_t T1000_a[]= { 5000, 3759, 3003, 2500 }; + static const uint16_t T1000_a[]= { 5000, 3759, 3003, 2500 }; static const uint16_t TT_a[] = { /*200 266 333 400 */ @@ -459,19 +459,19 @@ static void InitDQSPos4RcvrEn(const struct mem_controller *ctrl) static unsigned TrainRcvrEn(const struct mem_controller *ctrl, unsigned Pass, struct sys_info *sysinfo) { - const static uint32_t TestPattern0[] = { + static const uint32_t TestPattern0[] = { 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, }; - const static uint32_t TestPattern1[] = { + static const uint32_t TestPattern1[] = { 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, 0x55555555, }; - const static uint32_t TestPattern2[] = { + static const uint32_t TestPattern2[] = { 0x12345678, 0x87654321, 0x23456789, 0x98765432, 0x59385824, 0x30496724, 0x24490795, 0x99938733, 0x40385642, 0x38465245, 0x29432163, 0x05067894, @@ -1229,7 +1229,7 @@ static unsigned TrainWriteDQS(const struct mem_controller *ctrl, unsigned channe static unsigned TrainDQSRdWrPos(const struct mem_controller *ctrl, struct sys_info *sysinfo) { - const static uint32_t TestPatternJD1a[] = { + static const uint32_t TestPatternJD1a[] = { 0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFF, // QW0-1, ALL-EVEN 0x00000000,0x00000000,0x00000000,0x00000000, // QW2-3, ALL-EVEN 0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFF, // QW4-5, ALL-EVEN @@ -1267,7 +1267,7 @@ static unsigned TrainDQSRdWrPos(const struct mem_controller *ctrl, struct sys_in 0x80808080,0x80808080,0x7F7F7F7F,0x7F7F7F7F, // QW4-5, DQ7-ODD 0x80808080,0x80808080,0x80808080,0x80808080 // QW6-7, DQ7-ODD }; - const static uint32_t TestPatternJD1b[] = { + static const uint32_t TestPatternJD1b[] = { 0x00000000,0x00000000,0x00000000,0x00000000, // QW0,CHA-B, ALL-EVEN 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF, // QW1,CHA-B, ALL-EVEN 0x00000000,0x00000000,0x00000000,0x00000000, // QW2,CHA-B, ALL-EVEN diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c index 20e5cf662f..5cdd79f443 100644 --- a/src/superio/smsc/smscsuperio/superio.c +++ b/src/superio/smsc/smscsuperio/superio.c @@ -110,7 +110,7 @@ enum { * Note: Do _not_ list chips with different name but same device ID twice! * The result would be that the init code would be executed twice! */ -const static struct logical_devices { +static const struct logical_devices { uint8_t superio_id; int devs[MAX_LOGICAL_DEVICES]; } logical_device_table[] = {