2011-07-07 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libchip/display/disp_hcms29xx.c, libchip/flash/am29lv160.c,
	libchip/i2c/i2c-2b-eeprom.c, libchip/i2c/i2c-ds1621.c,
	libchip/i2c/spi-flash-m25p40.c, libchip/i2c/spi-fram-fm25l256.c,
	libchip/i2c/spi-memdrv.c, libchip/rtc/ds1375.c: Eliminate use of GNU
	old-style field designator extension as recommended by clang.

9 files changed, 112 insertions, 104 deletions

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 9c052fe862..fccf89d02a 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,5 +1,13 @@
 2011-07-07	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* libchip/display/disp_hcms29xx.c, libchip/flash/am29lv160.c,
+	libchip/i2c/i2c-2b-eeprom.c, libchip/i2c/i2c-ds1621.c,
+	libchip/i2c/spi-flash-m25p40.c, libchip/i2c/spi-fram-fm25l256.c,
+	libchip/i2c/spi-memdrv.c, libchip/rtc/ds1375.c: Eliminate use of GNU
+	old-style field designator extension as recommended by clang.
+
+2011-07-07	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* libchip/i2c/spi-memdrv.h: Add missing semi-colon.
 
 2011-06-07	Sebastian Huber <sebastian.huber@embedded-brains.de>
diff --git a/c/src/libchip/display/disp_hcms29xx.c b/c/src/libchip/display/disp_hcms29xx.c
index cd4a7aaf41..e478e67973 100644
--- a/c/src/libchip/display/disp_hcms29xx.c
+++ b/c/src/libchip/display/disp_hcms29xx.c
@@ -918,17 +918,17 @@ rtems_device_driver disp_hcms29xx_dev_close
  * driver operation tables
  */
 static rtems_driver_address_table disp_hcms29xx_ops = {
-  initialization_entry: disp_hcms29xx_dev_initialize,
-  open_entry:           disp_hcms29xx_dev_open,
-  write_entry:          disp_hcms29xx_dev_write,
-  close_entry:          disp_hcms29xx_dev_close
+  .initialization_entry = disp_hcms29xx_dev_initialize,
+  .open_entry =           disp_hcms29xx_dev_open,
+  .write_entry =          disp_hcms29xx_dev_write,
+  .close_entry =          disp_hcms29xx_dev_close
 };
 
 
 static disp_hcms29xx_drv_t disp_hcms29xx_drv_tbl = {
   {/* public fields */
-  ops:         &disp_hcms29xx_ops, 
-  size:        sizeof (disp_hcms29xx_drv_t),
+    .ops =         &disp_hcms29xx_ops, 
+    .size =        sizeof (disp_hcms29xx_drv_t),
   },
   { /* our private fields */
   }
diff --git a/c/src/libchip/flash/am29lv160.c b/c/src/libchip/flash/am29lv160.c
index 923d4d7450..0e07f2b849 100644
--- a/c/src/libchip/flash/am29lv160.c
+++ b/c/src/libchip/flash/am29lv160.c
@@ -28,28 +28,28 @@
 const rtems_fdisk_segment_desc rtems_am29lv160t_segments[4] =
 {
   {
-    count:   31,
-    segment: 0,
-    offset:  0x00000000,
-    size:    RTEMS_FDISK_KBYTES (64)
+    .count =   31,
+    .segment = 0,
+    .offset =  0x00000000,
+    .size =    RTEMS_FDISK_KBYTES (64)
   },
   {
-    count:   1,
-    segment: 31,
-    offset:  0x001f0000,
-    size:    RTEMS_FDISK_KBYTES (32)
+    .count =   1,
+    .segment = 31,
+    .offset =  0x001f0000,
+    .size =    RTEMS_FDISK_KBYTES (32)
   },
   {
-    count:   2,
-    segment: 32,
-    offset:  0x001f8000,
-    size:    RTEMS_FDISK_KBYTES (8)
+    .count =   2,
+    .segment = 32,
+    .offset =  0x001f8000,
+    .size =    RTEMS_FDISK_KBYTES (8)
   },
   {
-    count:   1,
-    segment: 34,
-    offset:  0x001fc000,
-    size:    RTEMS_FDISK_KBYTES (16)
+    .count =   1,
+    .segment = 34,
+    .offset =  0x001fc000,
+    .size =    RTEMS_FDISK_KBYTES (16)
   }
 };
 
@@ -59,28 +59,28 @@ const rtems_fdisk_segment_desc rtems_am29lv160t_segments[4] =
 const rtems_fdisk_segment_desc rtems_am29lv160b_segments[] =
 {
   {
-    count:   1,
-    segment: 0,
-    offset:  0x00000000,
-    size:    RTEMS_FDISK_KBYTES (16)
+    .count =   1,
+    .segment = 0,
+    .offset =  0x00000000,
+    .size =    RTEMS_FDISK_KBYTES (16)
   },
   {
-    count:   2,
-    segment: 1,
-    offset:  0x00004000,
-    size:    RTEMS_FDISK_KBYTES (8)
+  .  count =   2,
+    .segment = 1,
+    .offset =  0x00004000,
+    .size =    RTEMS_FDISK_KBYTES (8)
   },
   {
-    count:   1,
-    segment: 3,
-    offset:  0x00008000,
-    size:    RTEMS_FDISK_KBYTES (32)
+    .count =   1,
+    .segment = 3,
+    .offset =  0x00008000,
+    .size =    RTEMS_FDISK_KBYTES (32)
   },
   {
-    count:   31,
-    segment: 4,
-    offset:  0x00010000,
-    size:    RTEMS_FDISK_KBYTES (64)
+    .count =   31,
+    .segment = 4,
+    .offset =  0x00010000,
+    .size =    RTEMS_FDISK_KBYTES (64)
   }
 };
 
@@ -465,10 +465,10 @@ rtems_am29lv160_erase_device (const rtems_fdisk_device_desc* dd,
 
 const rtems_fdisk_driver_handlers rtems_am29lv160_handlers =
 {
-  read:         rtems_am29lv160_read,
-  write:        rtems_am29lv160_write,
-  blank:        rtems_am29lv160_blank,
-  verify:       rtems_am29lv160_verify,
-  erase:        rtems_am29lv160_erase,
-  erase_device: rtems_am29lv160_erase_device
+  .read =         rtems_am29lv160_read,
+  .write =        rtems_am29lv160_write,
+  .blank =        rtems_am29lv160_blank,
+  .verify =       rtems_am29lv160_verify,
+  .erase =        rtems_am29lv160_erase,
+  .erase_device = rtems_am29lv160_erase_device
 };
diff --git a/c/src/libchip/i2c/i2c-2b-eeprom.c b/c/src/libchip/i2c/i2c-2b-eeprom.c
index fa6c0205b3..904470a1d5 100644
--- a/c/src/libchip/i2c/i2c-2b-eeprom.c
+++ b/c/src/libchip/i2c/i2c-2b-eeprom.c
@@ -155,23 +155,23 @@ i2c_2b_eeprom_read (rtems_device_major_number major,
 }
 
 static rtems_driver_address_table myops = {
-  read_entry:  i2c_2b_eeprom_read,
-  write_entry: i2c_2b_eeprom_write,
+  .read_entry =  i2c_2b_eeprom_read,
+  .write_entry = i2c_2b_eeprom_write,
 };
 
 static rtems_libi2c_drv_t my_drv_tbl = {
-  ops:         &myops,
-  size:        sizeof (my_drv_tbl),
+  .ops =         &myops,
+  .size =        sizeof (my_drv_tbl),
 };
 
 /* provide a second table for R/O access */
 static rtems_driver_address_table my_ro_ops = {
-  read_entry:  i2c_2b_eeprom_read,
+  .read_entry =  i2c_2b_eeprom_read,
 };
 
 static rtems_libi2c_drv_t my_ro_drv_tbl = {
-  ops:         &my_ro_ops,
-  size:        sizeof (my_ro_drv_tbl),
+  .ops =         &my_ro_ops,
+  .size =        sizeof (my_ro_drv_tbl),
 };
 
 
diff --git a/c/src/libchip/i2c/i2c-ds1621.c b/c/src/libchip/i2c/i2c-ds1621.c
index 2401763194..3615ea3b63 100644
--- a/c/src/libchip/i2c/i2c-ds1621.c
+++ b/c/src/libchip/i2c/i2c-ds1621.c
@@ -118,13 +118,13 @@ ds1621_read (rtems_device_major_number major, rtems_device_minor_number minor,
 }
 
 static rtems_driver_address_table myops = {
-  initialization_entry: ds1621_init,
-  read_entry:           ds1621_read,
+  .initialization_entry = ds1621_init,
+  .read_entry =           ds1621_read,
 };
 
 static rtems_libi2c_drv_t my_drv_tbl = {
-  ops:                  &myops,
-  size:                 sizeof (my_drv_tbl),
+  .ops =                  &myops,
+  .size =                 sizeof (my_drv_tbl),
 };
 
 rtems_libi2c_drv_t *i2c_ds1621_driver_descriptor = &my_drv_tbl;
diff --git a/c/src/libchip/i2c/spi-flash-m25p40.c b/c/src/libchip/i2c/spi-flash-m25p40.c
index 4114673191..74ac80d68b 100644
--- a/c/src/libchip/i2c/spi-flash-m25p40.c
+++ b/c/src/libchip/i2c/spi-flash-m25p40.c
@@ -25,16 +25,16 @@
 
 static spi_memdrv_t spi_flash_m25p40_rw_drv_t = {
   {/* public fields */
-  ops:         &spi_memdrv_rw_ops, /* operations of general memdrv */
-  size:        sizeof (spi_flash_m25p40_rw_drv_t),
+    .ops =         &spi_memdrv_rw_ops, /* operations of general memdrv */
+    .size =        sizeof (spi_flash_m25p40_rw_drv_t),
   },
   { /* our private fields */
-  baudrate:             2000000,
-  erase_before_program: true,
-  empty_state:          0xff,
-  page_size:            256, /* programming page size in byte */
-  sector_size:          0x10000 /* 64*1024 */, /* erase sector size in byte */
-  mem_size:             0x80000 /* 512*1024 */ /* total capacity in byte    */
+    .baudrate =             2000000,
+    .erase_before_program = true,
+    .empty_state =          0xff,
+    .page_size =            256,     /* programming page size in bytes */
+    .sector_size =          0x10000, /* 64K - erase sector size in bytes */
+    .mem_size =             0x80000, /* 512K - total capacity in bytes */
   }
 };
 
@@ -43,16 +43,16 @@ rtems_libi2c_drv_t *spi_flash_m25p40_rw_driver_descriptor =
 
 static spi_memdrv_t spi_flash_m25p40_ro_drv_t = {
   {/* public fields */
-  ops:         &spi_memdrv_ro_ops, /* operations of general memdrv */
-  size:        sizeof (spi_flash_m25p40_ro_drv_t),
+    .ops =         &spi_memdrv_ro_ops, /* operations of general memdrv */
+    .size =        sizeof (spi_flash_m25p40_ro_drv_t),
   },
   { /* our private fields */
-  baudrate:             2000000,
-  erase_before_program: true,
-  empty_state:          0xff,
-  page_size:            256, /* programming page size in byte */
-  sector_size:          0x10000 /* 64*1024 */, /* erase sector size in byte */
-  mem_size:             0x80000 /* 512*1024 */ /* total capacity in byte    */
+    .baudrate =             2000000,
+    .erase_before_program = true,
+    .empty_state =          0xff,
+    .page_size =            256,    /* programming page size in bytes */
+    .sector_size =          0x10000, /* 64K erase sector size in bytes */
+    .mem_size =             0x80000, /* 512K total capacity in bytes */
   }
 };
 
diff --git a/c/src/libchip/i2c/spi-fram-fm25l256.c b/c/src/libchip/i2c/spi-fram-fm25l256.c
index 30ef1e8cb2..030c756a78 100644
--- a/c/src/libchip/i2c/spi-fram-fm25l256.c
+++ b/c/src/libchip/i2c/spi-fram-fm25l256.c
@@ -25,16 +25,16 @@
 
 static spi_memdrv_t spi_fram_fm25l256_rw_drv_t = {
   {/* public fields */
-  ops:         &spi_memdrv_rw_ops, /* operations of general memdrv */
-  size:        sizeof (spi_fram_fm25l256_rw_drv_t),
+    .ops =         &spi_memdrv_rw_ops, /* operations of general memdrv */
+    .size =        sizeof (spi_fram_fm25l256_rw_drv_t),
   },
   { /* our private fields */
-  baudrate:             2000000,
-  erase_before_program: false,
-  empty_state:          0xff,
-  page_size:            0x8000 /* 32*1024 */, /* programming page size in byte */
-  sector_size:          1,       /* erase sector size in byte     */
-  mem_size:             0x8000 /* 32*1024 */ /* total capacity in byte        */
+    .baudrate =             2000000,
+    .erase_before_program = false,
+    .empty_state =          0xff,
+    .page_size =            0x8000, /* 32K programming page size in bytes */
+    .sector_size =          1,      /* erase sector size in bytes */
+    .mem_size =             0x8000, /* 32K total capacity in bytes */
   }
 };
 
@@ -43,16 +43,16 @@ rtems_libi2c_drv_t *spi_fram_fm25l256_rw_driver_descriptor =
 
 static spi_memdrv_t spi_fram_fm25l256_ro_drv_t = {
   {/* public fields */
-  ops:         &spi_memdrv_ro_ops, /* operations of general memdrv */
-  size:        sizeof (spi_fram_fm25l256_ro_drv_t),
+    .ops =         &spi_memdrv_ro_ops, /* operations of general memdrv */
+    .size =        sizeof (spi_fram_fm25l256_ro_drv_t),
   },
   { /* our private fields */
-  baudrate:             2000000,
-  erase_before_program: false,
-  empty_state:          0xff,
-  page_size:            0x8000 /* 32*1024 */, /* programming page size in byte */
-  sector_size:          1,       /* erase sector size in byte     */
-  mem_size:             0x8000 /* 32*1024 */ /* total capacity in byte        */
+    .baudrate =             2000000,
+    .erase_before_program = false,
+    .empty_state =          0xff,
+    .page_size =            0x8000, /* 32k programming page size in bytes */
+    .sector_size =          1,      /* erase sector size in bytes */
+    .mem_size =             0x8000, /* 32k total capacity in bytes */
   }
 };
 
diff --git a/c/src/libchip/i2c/spi-memdrv.c b/c/src/libchip/i2c/spi-memdrv.c
index 6dbb929e6a..7950a0fa0d 100644
--- a/c/src/libchip/i2c/spi-memdrv.c
+++ b/c/src/libchip/i2c/spi-memdrv.c
@@ -136,11 +136,11 @@ rtems_status_code spi_memdrv_write
   int                  cmd_size;
   spi_memdrv_param_t  *mem_param_ptr;
   rtems_libi2c_tfr_mode_t tfr_mode = {
-  baudrate:      20000000, /* maximum bits per second                   */
-  bits_per_char: 8,        /* how many bits per byte/word/longword?     */
-  lsb_first:      FALSE,   /* FALSE: send MSB first                     */
-  clock_inv:      FALSE,   /* FALSE: non-inverted clock (high active)   */
-  clock_phs:      FALSE    /* FALSE: clock starts in middle of data tfr */
+    .baudrate =      20000000, /* maximum bits per second                   */
+    .bits_per_char = 8,        /* how many bits per byte/word/longword?     */
+    .lsb_first =     FALSE,    /* FALSE: send MSB first                     */
+    .clock_inv =     FALSE,    /* FALSE: non-inverted clock (high active)   */
+    .clock_phs =     FALSE     /* FALSE: clock starts in middle of data tfr */
   } ;
 
   /*
@@ -320,12 +320,12 @@ rtems_status_code spi_memdrv_read
   int                  cmd_size;
   spi_memdrv_param_t  *mem_param_ptr;
   rtems_libi2c_tfr_mode_t tfr_mode = {
-  baudrate:      20000000, /* maximum bits per second                   */
-  bits_per_char: 8,        /* how many bits per byte/word/longword?     */
-  lsb_first:      FALSE,   /* FALSE: send MSB first                     */
-  clock_inv:      FALSE,   /* FALSE: non-inverted clock (high active)   */
-  clock_phs:      FALSE    /* FALSE: clock starts in middle of data tfr */
-  } ;
+    .baudrate =      20000000, /* maximum bits per second                   */
+    .bits_per_char = 8,        /* how many bits per byte/word/longword?     */
+    .lsb_first =     FALSE,    /* FALSE: send MSB first                     */
+    .clock_inv =     FALSE,    /* FALSE: non-inverted clock (high active)   */
+    .clock_phs =     FALSE     /* FALSE: clock starts in middle of data tfr */
+  };
 
   /*
    * get mem parameters
@@ -435,11 +435,11 @@ rtems_status_code spi_memdrv_read
  * driver operation tables
  */
 rtems_driver_address_table spi_memdrv_rw_ops = {
-  read_entry:  spi_memdrv_read,
-  write_entry: spi_memdrv_write
+  .read_entry =  spi_memdrv_read,
+  .write_entry = spi_memdrv_write
 };
 
 rtems_driver_address_table spi_memdrv_ro_ops = {
-  read_entry:  spi_memdrv_read,
+  .read_entry =  spi_memdrv_read,
 };
 
diff --git a/c/src/libchip/rtc/ds1375.c b/c/src/libchip/rtc/ds1375.c
index 8d53818ef4..b4234c49b9 100644
--- a/c/src/libchip/rtc/ds1375.c
+++ b/c/src/libchip/rtc/ds1375.c
@@ -454,7 +454,7 @@ bool rtc_ds1375_device_probe(
 }
 
 rtc_fns rtc_ds1375_fns = {
-  deviceInitialize: ds1375_initialize,
-  deviceGetTime:    ds1375_get_time,
-  deviceSetTime:    ds1375_set_time,
+  .deviceInitialize = ds1375_initialize,
+  .deviceGetTime =    ds1375_get_time,
+  .deviceSetTime =    ds1375_set_time,
 };