Changeset 06a36cd1 in rtems


Ignore:
Timestamp:
Jul 7, 2011, 10:15:25 PM (8 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master
Children:
d90fef2
Parents:
0d23caa
Message:

2011-07-07 Joel Sherrill <joel.sherrill@…>

  • 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.
Location:
c/src
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • c/src/ChangeLog

    r0d23caa r06a36cd1  
     12011-07-07      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * libchip/display/disp_hcms29xx.c, libchip/flash/am29lv160.c,
     4        libchip/i2c/i2c-2b-eeprom.c, libchip/i2c/i2c-ds1621.c,
     5        libchip/i2c/spi-flash-m25p40.c, libchip/i2c/spi-fram-fm25l256.c,
     6        libchip/i2c/spi-memdrv.c, libchip/rtc/ds1375.c: Eliminate use of GNU
     7        old-style field designator extension as recommended by clang.
     8
    192011-07-07      Joel Sherrill <joel.sherrill@oarcorp.com>
    210
  • c/src/libchip/display/disp_hcms29xx.c

    r0d23caa r06a36cd1  
    919919 */
    920920static rtems_driver_address_table disp_hcms29xx_ops = {
    921   initialization_entry: disp_hcms29xx_dev_initialize,
    922   open_entry:           disp_hcms29xx_dev_open,
    923   write_entry:          disp_hcms29xx_dev_write,
    924   close_entry:          disp_hcms29xx_dev_close
     921  .initialization_entry = disp_hcms29xx_dev_initialize,
     922  .open_entry =           disp_hcms29xx_dev_open,
     923  .write_entry =          disp_hcms29xx_dev_write,
     924  .close_entry =          disp_hcms29xx_dev_close
    925925};
    926926
     
    928928static disp_hcms29xx_drv_t disp_hcms29xx_drv_tbl = {
    929929  {/* public fields */
    930   ops:         &disp_hcms29xx_ops,
    931   size:        sizeof (disp_hcms29xx_drv_t),
     930    .ops =         &disp_hcms29xx_ops,
     931    .size =        sizeof (disp_hcms29xx_drv_t),
    932932  },
    933933  { /* our private fields */
  • c/src/libchip/flash/am29lv160.c

    r0d23caa r06a36cd1  
    2929{
    3030  {
    31     count:   31,
    32     segment: 0,
    33     offset:  0x00000000,
    34     size:    RTEMS_FDISK_KBYTES (64)
    35   },
    36   {
    37     count:   1,
    38     segment: 31,
    39     offset:  0x001f0000,
    40     size:    RTEMS_FDISK_KBYTES (32)
    41   },
    42   {
    43     count:   2,
    44     segment: 32,
    45     offset:  0x001f8000,
    46     size:    RTEMS_FDISK_KBYTES (8)
    47   },
    48   {
    49     count:   1,
    50     segment: 34,
    51     offset:  0x001fc000,
    52     size:    RTEMS_FDISK_KBYTES (16)
     31    .count =   31,
     32    .segment = 0,
     33    .offset =  0x00000000,
     34    .size =    RTEMS_FDISK_KBYTES (64)
     35  },
     36  {
     37    .count =   1,
     38    .segment = 31,
     39    .offset =  0x001f0000,
     40    .size =    RTEMS_FDISK_KBYTES (32)
     41  },
     42  {
     43    .count =   2,
     44    .segment = 32,
     45    .offset =  0x001f8000,
     46    .size =    RTEMS_FDISK_KBYTES (8)
     47  },
     48  {
     49    .count =   1,
     50    .segment = 34,
     51    .offset =  0x001fc000,
     52    .size =    RTEMS_FDISK_KBYTES (16)
    5353  }
    5454};
     
    6060{
    6161  {
    62     count:   1,
    63     segment: 0,
    64     offset:  0x00000000,
    65     size:    RTEMS_FDISK_KBYTES (16)
    66   },
    67   {
    68     count:   2,
    69     segment: 1,
    70     offset:  0x00004000,
    71     size:    RTEMS_FDISK_KBYTES (8)
    72   },
    73   {
    74     count:   1,
    75     segment: 3,
    76     offset:  0x00008000,
    77     size:    RTEMS_FDISK_KBYTES (32)
    78   },
    79   {
    80     count:   31,
    81     segment: 4,
    82     offset:  0x00010000,
    83     size:    RTEMS_FDISK_KBYTES (64)
     62    .count =   1,
     63    .segment = 0,
     64    .offset =  0x00000000,
     65    .size =    RTEMS_FDISK_KBYTES (16)
     66  },
     67  {
     68  .  count =   2,
     69    .segment = 1,
     70    .offset =  0x00004000,
     71    .size =    RTEMS_FDISK_KBYTES (8)
     72  },
     73  {
     74    .count =   1,
     75    .segment = 3,
     76    .offset =  0x00008000,
     77    .size =    RTEMS_FDISK_KBYTES (32)
     78  },
     79  {
     80    .count =   31,
     81    .segment = 4,
     82    .offset =  0x00010000,
     83    .size =    RTEMS_FDISK_KBYTES (64)
    8484  }
    8585};
     
    466466const rtems_fdisk_driver_handlers rtems_am29lv160_handlers =
    467467{
    468   read:         rtems_am29lv160_read,
    469   write:        rtems_am29lv160_write,
    470   blank:        rtems_am29lv160_blank,
    471   verify:       rtems_am29lv160_verify,
    472   erase:        rtems_am29lv160_erase,
    473   erase_device: rtems_am29lv160_erase_device
     468  .read =         rtems_am29lv160_read,
     469  .write =        rtems_am29lv160_write,
     470  .blank =        rtems_am29lv160_blank,
     471  .verify =       rtems_am29lv160_verify,
     472  .erase =        rtems_am29lv160_erase,
     473  .erase_device = rtems_am29lv160_erase_device
    474474};
  • c/src/libchip/i2c/i2c-2b-eeprom.c

    r0d23caa r06a36cd1  
    156156
    157157static rtems_driver_address_table myops = {
    158   read_entry:  i2c_2b_eeprom_read,
    159   write_entry: i2c_2b_eeprom_write,
     158  .read_entry =  i2c_2b_eeprom_read,
     159  .write_entry = i2c_2b_eeprom_write,
    160160};
    161161
    162162static rtems_libi2c_drv_t my_drv_tbl = {
    163   ops:         &myops,
    164   size:        sizeof (my_drv_tbl),
     163  .ops =         &myops,
     164  .size =        sizeof (my_drv_tbl),
    165165};
    166166
    167167/* provide a second table for R/O access */
    168168static rtems_driver_address_table my_ro_ops = {
    169   read_entry:  i2c_2b_eeprom_read,
     169  .read_entry =  i2c_2b_eeprom_read,
    170170};
    171171
    172172static rtems_libi2c_drv_t my_ro_drv_tbl = {
    173   ops:         &my_ro_ops,
    174   size:        sizeof (my_ro_drv_tbl),
     173  .ops =         &my_ro_ops,
     174  .size =        sizeof (my_ro_drv_tbl),
    175175};
    176176
  • c/src/libchip/i2c/i2c-ds1621.c

    r0d23caa r06a36cd1  
    119119
    120120static rtems_driver_address_table myops = {
    121   initialization_entry: ds1621_init,
    122   read_entry:           ds1621_read,
     121  .initialization_entry = ds1621_init,
     122  .read_entry =           ds1621_read,
    123123};
    124124
    125125static rtems_libi2c_drv_t my_drv_tbl = {
    126   ops:                  &myops,
    127   size:                 sizeof (my_drv_tbl),
     126  .ops =                  &myops,
     127  .size =                 sizeof (my_drv_tbl),
    128128};
    129129
  • c/src/libchip/i2c/spi-flash-m25p40.c

    r0d23caa r06a36cd1  
    2626static spi_memdrv_t spi_flash_m25p40_rw_drv_t = {
    2727  {/* public fields */
    28   ops:         &spi_memdrv_rw_ops, /* operations of general memdrv */
    29   size:        sizeof (spi_flash_m25p40_rw_drv_t),
     28    .ops =         &spi_memdrv_rw_ops, /* operations of general memdrv */
     29    .size =        sizeof (spi_flash_m25p40_rw_drv_t),
    3030  },
    3131  { /* our private fields */
    32   baudrate:             2000000,
    33   erase_before_program: true,
    34   empty_state:          0xff,
    35   page_size:            256, /* programming page size in byte */
    36   sector_size:          0x10000 /* 64*1024 */, /* erase sector size in byte */
    37   mem_size:             0x80000 /* 512*1024 */ /* total capacity in byte    */
     32    .baudrate =             2000000,
     33    .erase_before_program = true,
     34    .empty_state =          0xff,
     35    .page_size =            256,     /* programming page size in bytes */
     36    .sector_size =          0x10000, /* 64K - erase sector size in bytes */
     37    .mem_size =             0x80000, /* 512K - total capacity in bytes */
    3838  }
    3939};
     
    4444static spi_memdrv_t spi_flash_m25p40_ro_drv_t = {
    4545  {/* public fields */
    46   ops:         &spi_memdrv_ro_ops, /* operations of general memdrv */
    47   size:        sizeof (spi_flash_m25p40_ro_drv_t),
     46    .ops =         &spi_memdrv_ro_ops, /* operations of general memdrv */
     47    .size =        sizeof (spi_flash_m25p40_ro_drv_t),
    4848  },
    4949  { /* our private fields */
    50   baudrate:             2000000,
    51   erase_before_program: true,
    52   empty_state:          0xff,
    53   page_size:            256, /* programming page size in byte */
    54   sector_size:          0x10000 /* 64*1024 */, /* erase sector size in byte */
    55   mem_size:             0x80000 /* 512*1024 */ /* total capacity in byte    */
     50    .baudrate =             2000000,
     51    .erase_before_program = true,
     52    .empty_state =          0xff,
     53    .page_size =            256,    /* programming page size in bytes */
     54    .sector_size =          0x10000, /* 64K erase sector size in bytes */
     55    .mem_size =             0x80000, /* 512K total capacity in bytes */
    5656  }
    5757};
  • c/src/libchip/i2c/spi-fram-fm25l256.c

    r0d23caa r06a36cd1  
    2626static spi_memdrv_t spi_fram_fm25l256_rw_drv_t = {
    2727  {/* public fields */
    28   ops:         &spi_memdrv_rw_ops, /* operations of general memdrv */
    29   size:        sizeof (spi_fram_fm25l256_rw_drv_t),
     28    .ops =         &spi_memdrv_rw_ops, /* operations of general memdrv */
     29    .size =        sizeof (spi_fram_fm25l256_rw_drv_t),
    3030  },
    3131  { /* our private fields */
    32   baudrate:             2000000,
    33   erase_before_program: false,
    34   empty_state:          0xff,
    35   page_size:            0x8000 /* 32*1024 */, /* programming page size in byte */
    36   sector_size:          1,       /* erase sector size in byte    */
    37   mem_size:             0x8000 /* 32*1024 */ /* total capacity in byte        */
     32    .baudrate =             2000000,
     33    .erase_before_program = false,
     34    .empty_state =          0xff,
     35    .page_size =            0x8000, /* 32K programming page size in bytes */
     36    .sector_size =          1,      /* erase sector size in bytes */
     37    .mem_size =             0x8000, /* 32K total capacity in bytes */
    3838  }
    3939};
     
    4444static spi_memdrv_t spi_fram_fm25l256_ro_drv_t = {
    4545  {/* public fields */
    46   ops:         &spi_memdrv_ro_ops, /* operations of general memdrv */
    47   size:        sizeof (spi_fram_fm25l256_ro_drv_t),
     46    .ops =         &spi_memdrv_ro_ops, /* operations of general memdrv */
     47    .size =        sizeof (spi_fram_fm25l256_ro_drv_t),
    4848  },
    4949  { /* our private fields */
    50   baudrate:             2000000,
    51   erase_before_program: false,
    52   empty_state:          0xff,
    53   page_size:            0x8000 /* 32*1024 */, /* programming page size in byte */
    54   sector_size:          1,       /* erase sector size in byte    */
    55   mem_size:             0x8000 /* 32*1024 */ /* total capacity in byte        */
     50    .baudrate =             2000000,
     51    .erase_before_program = false,
     52    .empty_state =          0xff,
     53    .page_size =            0x8000, /* 32k programming page size in bytes */
     54    .sector_size =          1,      /* erase sector size in bytes */
     55    .mem_size =             0x8000, /* 32k total capacity in bytes */
    5656  }
    5757};
  • c/src/libchip/i2c/spi-memdrv.c

    r0d23caa r06a36cd1  
    137137  spi_memdrv_param_t  *mem_param_ptr;
    138138  rtems_libi2c_tfr_mode_t tfr_mode = {
    139   baudrate:      20000000, /* maximum bits per second                   */
    140   bits_per_char: 8,        /* how many bits per byte/word/longword?     */
    141   lsb_first:      FALSE,   /* FALSE: send MSB first                     */
    142   clock_inv:      FALSE,   /* FALSE: non-inverted clock (high active)   */
    143   clock_phs:      FALSE    /* FALSE: clock starts in middle of data tfr */
     139    .baudrate =      20000000, /* maximum bits per second                   */
     140    .bits_per_char = 8,        /* how many bits per byte/word/longword?     */
     141    .lsb_first =     FALSE,    /* FALSE: send MSB first                     */
     142    .clock_inv =     FALSE,    /* FALSE: non-inverted clock (high active)   */
     143    .clock_phs =     FALSE     /* FALSE: clock starts in middle of data tfr */
    144144  } ;
    145145
     
    321321  spi_memdrv_param_t  *mem_param_ptr;
    322322  rtems_libi2c_tfr_mode_t tfr_mode = {
    323   baudrate:      20000000, /* maximum bits per second                   */
    324   bits_per_char: 8,        /* how many bits per byte/word/longword?     */
    325   lsb_first:      FALSE,   /* FALSE: send MSB first                     */
    326   clock_inv:      FALSE,   /* FALSE: non-inverted clock (high active)   */
    327   clock_phs:      FALSE    /* FALSE: clock starts in middle of data tfr */
    328   } ;
     323    .baudrate =      20000000, /* maximum bits per second                   */
     324    .bits_per_char = 8,        /* how many bits per byte/word/longword?     */
     325    .lsb_first =     FALSE,    /* FALSE: send MSB first                     */
     326    .clock_inv =     FALSE,    /* FALSE: non-inverted clock (high active)   */
     327    .clock_phs =     FALSE     /* FALSE: clock starts in middle of data tfr */
     328  };
    329329
    330330  /*
     
    436436 */
    437437rtems_driver_address_table spi_memdrv_rw_ops = {
    438   read_entry:  spi_memdrv_read,
    439   write_entry: spi_memdrv_write
     438  .read_entry =  spi_memdrv_read,
     439  .write_entry = spi_memdrv_write
    440440};
    441441
    442442rtems_driver_address_table spi_memdrv_ro_ops = {
    443   read_entry:  spi_memdrv_read,
     443  .read_entry =  spi_memdrv_read,
    444444};
    445445
  • c/src/libchip/rtc/ds1375.c

    r0d23caa r06a36cd1  
    455455
    456456rtc_fns rtc_ds1375_fns = {
    457   deviceInitialize: ds1375_initialize,
    458   deviceGetTime:    ds1375_get_time,
    459   deviceSetTime:    ds1375_set_time,
     457  .deviceInitialize = ds1375_initialize,
     458  .deviceGetTime =    ds1375_get_time,
     459  .deviceSetTime =    ds1375_set_time,
    460460};
Note: See TracChangeset for help on using the changeset viewer.