diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-23 09:59:52 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-23 09:59:52 +0000 |
| commit | ee4f57d9a6c032da422c6b9b84761dbb30cc2fd8 (patch) | |
| tree | 06ca24c6757f6f442b80960ca602da9a9e05304a | |
| parent | 2004-03-23 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-ee4f57d9a6c032da422c6b9b84761dbb30cc2fd8.tar.bz2 | |
2004-03-23 Ralf Corsepius <ralf_corsepius@rtems.org>
* libchip/ide/ata.c, libchip/ide/ata_internal.h,
libchip/ide/ide_controller.c, libchip/ide/ide_ctrl_cfg.h,
libchip/ide/ide_ctrl_io.h, libchip/network/cs8900.c,
libchip/network/dec21140.c, libchip/network/elnk.c,
libchip/network/if_fxp.c, libchip/network/open_eth.c,
libchip/network/open_eth.h, libchip/network/sonic.c,
libchip/network/sonic.h, libchip/rtc/icm7170.c, libchip/rtc/icm7170.h,
libchip/rtc/icm7170_reg.c, libchip/rtc/icm7170_reg2.c,
libchip/rtc/icm7170_reg4.c, libchip/rtc/icm7170_reg8.c,
libchip/rtc/m48t08.c, libchip/rtc/m48t08.h, libchip/rtc/m48t08_reg.c,
libchip/rtc/m48t08_reg2.c, libchip/rtc/m48t08_reg4.c,
libchip/rtc/m48t08_reg8.c, libchip/rtc/rtc.h, libchip/serial/mc68681.c,
libchip/serial/mc68681.h, libchip/serial/mc68681_reg.c,
libchip/serial/mc68681_reg2.c, libchip/serial/mc68681_reg4.c,
libchip/serial/mc68681_reg8.c, libchip/serial/ns16550.c,
libchip/serial/ns16550_p.h, libchip/serial/serial.h,
libchip/serial/z85c30.c, libchip/serial/z85c30.h,
libchip/serial/z85c30_p.h, libchip/serial/z85c30_reg.c,
libchip/shmdr/addlq.c, libchip/shmdr/cnvpkt.c, libchip/shmdr/dump.c,
libchip/shmdr/fatal.c, libchip/shmdr/getlq.c, libchip/shmdr/init.c,
libchip/shmdr/initlq.c, libchip/shmdr/intr.c, libchip/shmdr/poll.c,
libchip/shmdr/send.c, libchip/shmdr/shm_driver.h: Convert to using c99
fixed-size types.
51 files changed, 520 insertions, 497 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 895c39136b..7952b222c2 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,15 +1,38 @@ -2004-03-14 Chris Johns <chrisj@rtems.org> - - * cs8900.c.bsp, cs8900.h.bsp: Updated the BSP example code. +2004-03-23 Ralf Corsepius <ralf_corsepius@rtems.org> + + * libchip/ide/ata.c, libchip/ide/ata_internal.h, + libchip/ide/ide_controller.c, libchip/ide/ide_ctrl_cfg.h, + libchip/ide/ide_ctrl_io.h, libchip/network/cs8900.c, + libchip/network/dec21140.c, libchip/network/elnk.c, + libchip/network/if_fxp.c, libchip/network/open_eth.c, + libchip/network/open_eth.h, libchip/network/sonic.c, + libchip/network/sonic.h, libchip/rtc/icm7170.c, libchip/rtc/icm7170.h, + libchip/rtc/icm7170_reg.c, libchip/rtc/icm7170_reg2.c, + libchip/rtc/icm7170_reg4.c, libchip/rtc/icm7170_reg8.c, + libchip/rtc/m48t08.c, libchip/rtc/m48t08.h, libchip/rtc/m48t08_reg.c, + libchip/rtc/m48t08_reg2.c, libchip/rtc/m48t08_reg4.c, + libchip/rtc/m48t08_reg8.c, libchip/rtc/rtc.h, libchip/serial/mc68681.c, + libchip/serial/mc68681.h, libchip/serial/mc68681_reg.c, + libchip/serial/mc68681_reg2.c, libchip/serial/mc68681_reg4.c, + libchip/serial/mc68681_reg8.c, libchip/serial/ns16550.c, + libchip/serial/ns16550_p.h, libchip/serial/serial.h, + libchip/serial/z85c30.c, libchip/serial/z85c30.h, + libchip/serial/z85c30_p.h, libchip/serial/z85c30_reg.c, + libchip/shmdr/addlq.c, libchip/shmdr/cnvpkt.c, libchip/shmdr/dump.c, + libchip/shmdr/fatal.c, libchip/shmdr/getlq.c, libchip/shmdr/init.c, + libchip/shmdr/initlq.c, libchip/shmdr/intr.c, libchip/shmdr/poll.c, + libchip/shmdr/send.c, libchip/shmdr/shm_driver.h: Convert to using c99 + fixed-size types. - * cs8900.c, cs8900.h: - Changes made to support the DIMMPC. This is a pc396 target with IO port - support. - Minor formating clean up. - Add documentation to the header file. +2004-03-14 Chris Johns <chrisj@rtems.org> - * README.cs8900: - The CS8900 driver is documented in the cs8900.h header file. + * libchip/network/cs8900.c.bsp, libchip/network/cs8900.h.bsp: Updated + the BSP example code. + * libchip/network/cs8900.c, libchip/network/cs8900.h: Changes made to + support the DIMMPC. This is a pc386 target with IO port support. Minor + formating clean up. Add documentation to the header file. + * libchip/network/README.cs8900: The CS8900 driver is documented in the + cs8900.h header file. 2004-03-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/c/src/libchip/ide/ata.c b/c/src/libchip/ide/ata.c index a22c4407cc..0b72de538d 100644 --- a/c/src/libchip/ide/ata.c +++ b/c/src/libchip/ide/ata.c @@ -134,7 +134,7 @@ ata_io_data_request(dev_t device, blkdev_request *req) * ata_devs array */ rtems_device_minor_number ctrl_minor; - unsigned8 dev; + uint8_t dev; rel_minor = (rtems_filesystem_dev_minor_t(device)) / ATA_MINOR_NUM_RESERVED_PER_ATA_DEVICE; @@ -217,15 +217,15 @@ ata_io_data_request(dev_t device, blkdev_request *req) */ if (ATA_DEV_INFO(ctrl_minor, dev).lba_avaible) { - areq->regs.regs[IDE_REGISTER_LBA0] = (unsigned8)req->start; - areq->regs.regs[IDE_REGISTER_LBA1] = (unsigned8)(req->start >> 8); - areq->regs.regs[IDE_REGISTER_LBA2] = (unsigned8)(req->start >> 16); - areq->regs.regs[IDE_REGISTER_LBA3] |= (unsigned8) (req->start >> 24); + areq->regs.regs[IDE_REGISTER_LBA0] = (uint8_t )req->start; + areq->regs.regs[IDE_REGISTER_LBA1] = (uint8_t )(req->start >> 8); + areq->regs.regs[IDE_REGISTER_LBA2] = (uint8_t )(req->start >> 16); + areq->regs.regs[IDE_REGISTER_LBA3] |= (uint8_t ) (req->start >> 24); areq->regs.regs[IDE_REGISTER_LBA3] |= IDE_REGISTER_LBA3_L; } else { - unsigned32 count = req->start; + uint32_t count = req->start; areq->regs.regs[IDE_REGISTER_SECTOR_NUMBER] = (count % ATA_DEV_INFO(ctrl_minor, dev).sectors) + 1; @@ -237,8 +237,8 @@ ata_io_data_request(dev_t device, blkdev_request *req) /* now count = number of cylinders */ count %= ATA_DEV_INFO(ctrl_minor, dev).cylinders; - areq->regs.regs[IDE_REGISTER_CYLINDER_LOW] = (unsigned8)count; - areq->regs.regs[IDE_REGISTER_CYLINDER_HIGH] = (unsigned8)(count >> 8); + areq->regs.regs[IDE_REGISTER_CYLINDER_LOW] = (uint8_t )count; + areq->regs.regs[IDE_REGISTER_CYLINDER_HIGH] = (uint8_t )(count >> 8); areq->regs.regs[IDE_REGISTER_DEVICE_HEAD] &= ~IDE_REGISTER_DEVICE_HEAD_L; } @@ -274,7 +274,7 @@ ata_non_data_request(dev_t device, int cmd, void *argp) * ata_devs array */ rtems_device_minor_number ctrl_minor; - unsigned8 dev; + uint8_t dev; ata_queue_msg_t msg; rel_minor = (rtems_filesystem_dev_minor_t(device)) / @@ -312,7 +312,7 @@ ata_non_data_request(dev_t device, int cmd, void *argp) ATA_COMMAND_SET_MULTIPLE_MODE; areq->regs.to_write |= ATA_REGISTERS_VALUE(IDE_REGISTER_SECTOR_COUNT); - areq->regs.regs[IDE_REGISTER_SECTOR_COUNT] = *(unsigned8 *)argp; + areq->regs.regs[IDE_REGISTER_SECTOR_COUNT] = *(uint8_t *)argp; break; default: @@ -356,7 +356,7 @@ ata_non_data_request(dev_t device, int cmd, void *argp) { case ATAIO_SET_MULTIPLE_MODE: ATA_DEV_INFO(ctrl_minor, dev).current_multiple = - *(unsigned8 *)argp; + *(uint8_t *)argp; break; default: @@ -391,11 +391,11 @@ static void ata_process_request(rtems_device_minor_number ctrl_minor) { ata_req_t *areq; - unsigned16 byte; /* emphasize that only 8 low bits is meaningful */ + uint16_t byte; /* emphasize that only 8 low bits is meaningful */ ata_queue_msg_t msg; - unsigned8 i, dev; - unsigned16 val; - unsigned16 data_bs; /* the number of 512-bytes sectors in one + uint8_t i, dev; + uint16_t val; + uint16_t data_bs; /* the number of 512-bytes sectors in one * data block */ ISR_Level level; @@ -429,7 +429,7 @@ ata_process_request(rtems_device_minor_number ctrl_minor) /* fill in all necessary registers on the controller */ for (i=0; i< ATA_MAX_CMD_REG_OFFSET; i++) { - unsigned32 reg = (1 << i); + uint32_t reg = (1 << i); if (areq->regs.to_write & reg) ide_controller_write_register(ctrl_minor, i, areq->regs.regs[i]); } @@ -554,7 +554,7 @@ ata_add_to_controller_queue(rtems_device_minor_number ctrl_minor, Chain_Append(&ata_ide_ctrls[ctrl_minor].reqs, &areq->link); if (Chain_Has_only_one_node(&ata_ide_ctrls[ctrl_minor].reqs)) { - unsigned16 val; + uint16_t val; ata_queue_msg_t msg; #ifdef DEBUG @@ -589,7 +589,7 @@ ata_interrupt_handler(rtems_vector_number vec) { Chain_Node *the_node = ((Chain_Control *)(&ata_int_vec[vec]))->first; ata_queue_msg_t msg; - unsigned16 byte; /* emphasize that only 8 low bits is meaningful */ + uint16_t byte; /* emphasize that only 8 low bits is meaningful */ for ( ; !Chain_Is_tail(&ata_int_vec[vec], the_node) ; ) { @@ -621,9 +621,9 @@ ata_interrupt_handler(rtems_vector_number vec) static inline void ata_pio_in_protocol(rtems_device_minor_number ctrl_minor, ata_req_t *areq) { - unsigned16 bs, val; - unsigned8 dev; - unsigned32 min_val; + uint16_t bs, val; + uint8_t dev; + uint32_t min_val; ata_queue_msg_t msg; dev = areq->regs.regs[IDE_REGISTER_DEVICE_HEAD] & @@ -664,9 +664,9 @@ ata_pio_in_protocol(rtems_device_minor_number ctrl_minor, ata_req_t *areq) static inline void ata_pio_out_protocol(rtems_device_minor_number ctrl_minor, ata_req_t *areq) { - unsigned16 bs, val; - unsigned8 dev; - unsigned32 min_val; + uint16_t bs, val; + uint8_t dev; + uint32_t min_val; ata_queue_msg_t msg; dev = areq->regs.regs[IDE_REGISTER_DEVICE_HEAD] & @@ -715,11 +715,11 @@ static rtems_task ata_queue_task(rtems_task_argument arg) { ata_queue_msg_t msg; - rtems_unsigned32 size; + uint32_t size; ata_req_t *areq; rtems_device_minor_number ctrl_minor; - unsigned16 val; - unsigned16 val1; + uint16_t val; + uint16_t val1; rtems_status_code rc; ISR_Level level; @@ -897,13 +897,13 @@ ata_initialize(rtems_device_major_number major, rtems_device_minor_number minor_arg, void *args) { - unsigned32 ctrl_minor; + uint32_t ctrl_minor; rtems_status_code status; ata_req_t areq; blkdev_request1 breq; - unsigned8 i, dev = 0; - unsigned16 *buffer; - unsigned16 ec; + uint8_t i, dev = 0; + uint16_t *buffer; + uint16_t ec; char name[ATA_MAX_NAME_LENGTH]; dev_t device; ata_int_st_t *int_st; @@ -962,7 +962,7 @@ ata_initialize(rtems_device_major_number major, return status; } - buffer = (unsigned16 *)malloc(ATA_SECTOR_SIZE); + buffer = (uint16_t *)malloc(ATA_SECTOR_SIZE); if (buffer == NULL) { rtems_task_delete(ata_task_id); @@ -1147,10 +1147,10 @@ ata_initialize(rtems_device_major_number major, ATA_DEV_INFO(ctrl_minor, dev).lba_avaible = (CF_LE_W(buffer[ATA_IDENT_WORD_CAPABILITIES]) >> 9) & 0x1; ATA_DEV_INFO(ctrl_minor, dev).max_multiple = - (unsigned8) (CF_LE_W(buffer[ATA_IDENT_WORD_RW_MULT])); + (uint8_t ) (CF_LE_W(buffer[ATA_IDENT_WORD_RW_MULT])); ATA_DEV_INFO(ctrl_minor, dev).current_multiple = (CF_LE_W(buffer[ATA_IDENT_WORD_MULT_SECS]) & 0x100) ? - (unsigned8)(CF_LE_W(buffer[ATA_IDENT_WORD_MULT_SECS])) : + (uint8_t )(CF_LE_W(buffer[ATA_IDENT_WORD_MULT_SECS])) : 0; if ((CF_LE_W(buffer[ATA_IDENT_WORD_FIELD_VALIDITY]) & @@ -1236,10 +1236,10 @@ static void ata_process_request_on_init_phase(rtems_device_minor_number ctrl_minor, ata_req_t *areq) { - unsigned16 byte;/* emphasize that only 8 low bits is meaningful */ - unsigned8 i, dev; - unsigned16 val, val1; - unsigned16 data_bs; /* the number of 512 bytes sectors into one + uint16_t byte;/* emphasize that only 8 low bits is meaningful */ + uint8_t i, dev; + uint16_t val, val1; + uint16_t data_bs; /* the number of 512 bytes sectors into one * data block */ assert(areq); @@ -1260,7 +1260,7 @@ ata_process_request_on_init_phase(rtems_device_minor_number ctrl_minor, for (i=0; i< ATA_MAX_CMD_REG_OFFSET; i++) { - unsigned32 reg = (1 << i); + uint32_t reg = (1 << i); if (areq->regs.to_write & reg) ide_controller_write_register(ctrl_minor, i, areq->regs.regs[i]); diff --git a/c/src/libchip/ide/ata_internal.h b/c/src/libchip/ide/ata_internal.h index db204a1861..c922c90ceb 100644 --- a/c/src/libchip/ide/ata_internal.h +++ b/c/src/libchip/ide/ata_internal.h @@ -210,9 +210,9 @@ /* Command block registers */ typedef struct ata_registers_s { - unsigned16 regs[8]; /* command block registers */ - unsigned16 to_read; /* mask: which ata registers should be read */ - unsigned16 to_write; /* mask: which ata registers should be written */ + uint16_t regs[8]; /* command block registers */ + uint16_t to_read; /* mask: which ata registers should be read */ + uint16_t to_write; /* mask: which ata registers should be written */ } ata_registers_t; /* ATA request */ @@ -220,9 +220,9 @@ typedef struct ata_req_s { Chain_Node link; /* link in requests chain */ char type; /* request type */ ata_registers_t regs; /* ATA command */ - rtems_unsigned32 cnt; /* Number of sectors to be exchanged */ - rtems_unsigned32 cbuf; /* number of current buffer from breq in use */ - rtems_unsigned32 pos; /* current position in 'cbuf' */ + uint32_t cnt; /* Number of sectors to be exchanged */ + uint32_t cbuf; /* number of current buffer from breq in use */ + uint32_t pos; /* current position in 'cbuf' */ blkdev_request *breq; /* blkdev_request which corresponds to the * ata request */ @@ -295,21 +295,21 @@ typedef struct ata_ide_dev_s { * ATA device description */ typedef struct ata_dev_s { - signed8 present; /* 1 -- present, 0 -- not present, */ + int8_t present; /* 1 -- present, 0 -- not present, */ /* -1 -- non-initialized */ - unsigned16 cylinders; - unsigned16 heads; - unsigned16 sectors; - unsigned32 lba_sectors; /* for small disk */ + uint16_t cylinders; + uint16_t heads; + uint16_t sectors; + uint32_t lba_sectors; /* for small disk */ /* == cylinders * heads * sectors */ - unsigned8 lba_avaible; /* 0 - CHS mode, 1 - LBA mode */ + uint8_t lba_avaible; /* 0 - CHS mode, 1 - LBA mode */ - unsigned8 max_multiple; /* 0 if READ/WRITE MULTIPLE is unsupported */ - unsigned8 current_multiple; + uint8_t max_multiple; /* 0 if READ/WRITE MULTIPLE is unsupported */ + uint8_t current_multiple; - unsigned8 modes_avaible; /* OR of values for this modes */ - unsigned8 mode_active; + uint8_t modes_avaible; /* OR of values for this modes */ + uint8_t mode_active; } ata_dev_t; /* diff --git a/c/src/libchip/ide/ide_controller.c b/c/src/libchip/ide/ide_controller.c index 3de7f312cc..b00c406ff3 100644 --- a/c/src/libchip/ide/ide_controller.c +++ b/c/src/libchip/ide/ide_controller.c @@ -84,10 +84,10 @@ ide_controller_initialize(rtems_device_major_number major, */ void ide_controller_read_data_block(rtems_device_minor_number minor, - unsigned16 block_size, + uint16_t block_size, blkdev_sg_buffer *bufs, - rtems_unsigned32 *cbuf, - rtems_unsigned32 *pos) + uint32_t *cbuf, + uint32_t *pos) { IDE_Controller_Table[minor].fns->ctrl_read_block(minor, block_size, bufs, cbuf, pos); @@ -109,10 +109,10 @@ ide_controller_read_data_block(rtems_device_minor_number minor, */ void ide_controller_write_data_block(rtems_device_minor_number minor, - unsigned16 block_size, + uint16_t block_size, blkdev_sg_buffer *bufs, - rtems_unsigned32 *cbuf, - rtems_unsigned32 *pos) + uint32_t *cbuf, + uint32_t *pos) { IDE_Controller_Table[minor].fns->ctrl_write_block(minor, block_size, bufs, @@ -134,7 +134,7 @@ ide_controller_write_data_block(rtems_device_minor_number minor, void ide_controller_read_register(rtems_device_minor_number minor, int reg, - unsigned16 *value) + uint16_t *value) { IDE_Controller_Table[minor].fns->ctrl_reg_read(minor, reg, value); } @@ -153,7 +153,7 @@ ide_controller_read_register(rtems_device_minor_number minor, */ void ide_controller_write_register(rtems_device_minor_number minor, int reg, - unsigned16 value) + uint16_t value) { IDE_Controller_Table[minor].fns->ctrl_reg_write(minor, reg, value); } @@ -171,7 +171,7 @@ ide_controller_write_register(rtems_device_minor_number minor, int reg, * error occured */ rtems_status_code -ide_controller_config_io_speed(int minor, unsigned8 modes_avaible) +ide_controller_config_io_speed(int minor, uint8_t modes_avaible) { return IDE_Controller_Table[minor].fns->ctrl_config_io_speed( minor, diff --git a/c/src/libchip/ide/ide_ctrl_cfg.h b/c/src/libchip/ide/ide_ctrl_cfg.h index 951b1d0565..bb27f1a0ec 100644 --- a/c/src/libchip/ide/ide_ctrl_cfg.h +++ b/c/src/libchip/ide/ide_ctrl_cfg.h @@ -38,29 +38,29 @@ typedef enum { typedef struct ide_ctrl_fns_s { boolean (*ctrl_probe)(int minor); /* probe routine */ void (*ctrl_initialize)(int minor); - int (*ctrl_control)(int minor, unsigned32 command, + int (*ctrl_control)(int minor, uint32_t command, void *arg); /* * Functions which allow read/write registers of a particular controller. * (these functions may be used from ide_controller_read_register, * ide_controller_write_register) */ - void (*ctrl_reg_read)(int minor, int regist, unsigned16 *value); - void (*ctrl_reg_write)(int minor, int regist, unsigned16 value); + void (*ctrl_reg_read)(int minor, int regist, uint16_t *value); + void (*ctrl_reg_write)(int minor, int regist, uint16_t value); /* * The function allows to escape overhead for read/write register * functions calls */ - void (*ctrl_read_block)(int minor, unsigned16 block_size, - blkdev_sg_buffer *bufs, rtems_unsigned32 *cbuf, - rtems_unsigned32 *pos); - void (*ctrl_write_block)(int minor, unsigned16 block_size, - blkdev_sg_buffer *bufs, rtems_unsigned32 *cbuf, - rtems_unsigned32 *pos); + void (*ctrl_read_block)(int minor, uint16_t block_size, + blkdev_sg_buffer *bufs, uint32_t *cbuf, + uint32_t *pos); + void (*ctrl_write_block)(int minor, uint16_t block_size, + blkdev_sg_buffer *bufs, uint32_t *cbuf, + uint32_t *pos); rtems_status_code (*ctrl_config_io_speed)(int minor, - unsigned8 modes_available); + uint8_t modes_available); } ide_ctrl_fns_t; /* @@ -72,10 +72,10 @@ typedef struct ide_controller_bsp_table_s { ide_ctrl_devs_t type; /* chip type */ ide_ctrl_fns_t *fns; /* pointer to the set of driver routines */ boolean (*probe)(int minor); /* general probe routine */ - unsigned8 status; /* initialized/non initialized. Should be set + uint8_t status; /* initialized/non initialized. Should be set * to zero by static initialization */ - unsigned32 port1; /* port number for the port of the device */ + uint32_t port1; /* port number for the port of the device */ rtems_boolean int_driven; /* interrupt/poll driven */ rtems_vector_number int_vec; /* the interrupt vector of the device */ void *params; /* contains either device specific data or a diff --git a/c/src/libchip/ide/ide_ctrl_io.h b/c/src/libchip/ide/ide_ctrl_io.h index e87b9079a9..cf582b05d1 100644 --- a/c/src/libchip/ide/ide_ctrl_io.h +++ b/c/src/libchip/ide/ide_ctrl_io.h @@ -103,10 +103,10 @@ extern "C" { */ void ide_controller_read_data_block(rtems_device_minor_number minor, - unsigned16 block_size, + uint16_t block_size, blkdev_sg_buffer *bufs, - rtems_unsigned32 *cbuf, - rtems_unsigned32 *pos); + uint32_t *cbuf, + uint32_t *pos); /* * ide_controller_write_data_block -- @@ -124,10 +124,10 @@ ide_controller_read_data_block(rtems_device_minor_number minor, */ void ide_controller_write_data_block(rtems_device_minor_number minor, - unsigned16 block_size, + uint16_t block_size, blkdev_sg_buffer *bufs, - rtems_unsigned32 *cbuf, - rtems_unsigned32 *pos); + uint32_t *cbuf, + uint32_t *pos); /* * ide_controller_read_register -- @@ -144,7 +144,7 @@ ide_controller_write_data_block(rtems_device_minor_number minor, void ide_controller_read_register(rtems_device_minor_number minor, int reg, - unsigned16 *value); + uint16_t *value); /* * ide_controller_write_register -- @@ -160,7 +160,7 @@ ide_controller_read_register(rtems_device_minor_number minor, */ void ide_controller_write_register(rtems_device_minor_number minor, - int reg, unsigned16 value); + int reg, uint16_t value); /* * ide_controller_config_io_speed -- @@ -175,7 +175,7 @@ ide_controller_write_register(rtems_device_minor_number minor, * error occured */ rtems_status_code -ide_controller_config_io_speed(int minor, unsigned8 modes_avaible); +ide_controller_config_io_speed(int minor, uint8_t modes_avaible); #ifdef __cplusplus } diff --git a/c/src/libchip/network/cs8900.c b/c/src/libchip/network/cs8900.c index 3e7d219cd3..9774642463 100644 --- a/c/src/libchip/network/cs8900.c +++ b/c/src/libchip/network/cs8900.c @@ -198,7 +198,7 @@ static const char *cs8900_trace_labels[] = * Assumes a micro-second timer such as the Coldfire. */ -rtems_unsigned32 rtems_read_timer (); +uint32_t rtems_read_timer (); static inline void cs8900_trace (cs8900_device *cs, unsigned short key, unsigned long var) diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c index 5699753f67..0660e7ad26 100644 --- a/c/src/libchip/network/dec21140.c +++ b/c/src/libchip/network/dec21140.c @@ -170,9 +170,9 @@ /* message descriptor entry */ struct MD { /* used by hardware */ - volatile unsigned32 status; - volatile unsigned32 counts; - volatile unsigned32 buf1, buf2; + volatile uint32_t status; + volatile uint32_t counts; + volatile uint32_t buf1, buf2; /* used by software */ volatile struct mbuf *m; volatile struct MD *next; @@ -243,12 +243,12 @@ extern void Wait_X_ms( unsigned int timeToWait ); #define rtems_bsp_delay_in_bus_cycles(cycle) Wait_X_ms( cycle/100 ) #define CPU_CACHE_ALIGNMENT_FOR_BUFFER PG_SIZE -inline void st_le32(volatile unsigned32 *addr, unsigned32 value) +inline void st_le32(volatile uint32_t *addr, uint32_t value) { *(addr)=value ; } -inline unsigned32 ld_le32(volatile unsigned32 *addr) +inline uint32_t ld_le32(volatile uint32_t *addr) { return(*addr); } @@ -425,10 +425,10 @@ static int dec21140IsOn(const rtems_irq_connect_data* irq) static rtems_isr dec21140Enet_interrupt_handler ( struct dec21140_softc *sc ) { - volatile unsigned32 *tbase; - unsigned32 status; + volatile uint32_t *tbase; + uint32_t status; - tbase = (unsigned32 *)(sc->base); + tbase = (uint32_t *)(sc->base); /* * Read status @@ -1190,7 +1190,7 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) #if defined(__PPC__) pci_write_config_word(pbus, pdev, pfun, PCI_COMMAND, - (unsigned16) ( PCI_COMMAND_MEMORY | + (uint16_t ) ( PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE | PCI_COMMAND_WAIT | diff --git a/c/src/libchip/network/elnk.c b/c/src/libchip/network/elnk.c index d9b5fd2666..356cddcac4 100644 --- a/c/src/libchip/network/elnk.c +++ b/c/src/libchip/network/elnk.c @@ -204,12 +204,12 @@ extern void Wait_X_ms( unsigned int timeToWait ); #define rtems_bsp_delay_in_bus_cycles(cycle) Wait_X_ms( cycle/100 ) #define CPU_CACHE_ALIGNMENT_FOR_BUFFER PG_SIZE -inline void st_le32(volatile unsigned32 *addr, unsigned32 value) +inline void st_le32(volatile uint32_t *addr, uint32_t value) { *(addr)=value ; } -inline unsigned32 ld_le32(volatile unsigned32 *addr) +inline uint32_t ld_le32(volatile uint32_t *addr) { return(*addr); } @@ -879,10 +879,10 @@ static struct xl_type xl_devs[] = { struct RXMD { /* used by hardware */ - volatile unsigned32 next; - volatile unsigned32 status; - volatile unsigned32 addr; - volatile unsigned32 length; + volatile uint32_t next; + volatile uint32_t status; + volatile uint32_t addr; + volatile uint32_t length; /* used by software */ struct mbuf *mbuf; /* scratch variable used in the tx ring */ struct RXMD *next_md; @@ -900,15 +900,15 @@ struct RXMD struct tfrag { - volatile unsigned32 addr; - volatile unsigned32 length; + volatile uint32_t addr; + volatile uint32_t length; } __attribute__ ((packed)); struct TXMD { /* used by hardware */ - volatile unsigned32 next; - volatile unsigned32 status; + volatile uint32_t next; + volatile uint32_t status; struct tfrag txfrags[NUM_FRAGS]; /* used by software */ struct mbuf *mbuf; /* scratch variable used in the tx ring */ @@ -940,7 +940,7 @@ struct elnk_softc struct TXMD *tx_ring, *last_tx_md, *last_txchain_head; rtems_id stat_timer_id; - unsigned32 stats_update_ticks; + uint32_t stats_update_ticks; struct xl_stats xl_stats; @@ -2047,7 +2047,7 @@ elnk_interrupt_handler ( struct elnk_softc *sc ) #if 0 { - unsigned16 intstatus, intenable, indenable; + uint16_t intstatus, intenable, indenable; intstatus = CSR_READ_2(sc, XL_STATUS ); @@ -2132,7 +2132,7 @@ elnk_initialize_hardware (struct elnk_softc *sc) */ for(i=0 ; i<sc->numRxbuffers; i++) { - if( ((unsigned32)&sc->rx_ring[i] & 0x7) ) + if( ((uint32_t )&sc->rx_ring[i] & 0x7) ) { rtems_panic ("etherlink : unit elnk%d rx ring entry %d not aligned to 8 bytes\n", sc->xl_unit, i ); } @@ -2151,8 +2151,8 @@ elnk_initialize_hardware (struct elnk_softc *sc) sc->rx_ring[i].mbuf = m; st_le32( &sc->rx_ring[i].status, 0); - st_le32( &sc->rx_ring[i].next, (unsigned32)phys_to_bus( nxtmd )); - st_le32( &sc->rx_ring[i].addr, (unsigned32)phys_to_bus( mtod(m, void *) )); + st_le32( &sc->rx_ring[i].next, (uint32_t )phys_to_bus( nxtmd )); + st_le32( &sc->rx_ring[i].addr, (uint32_t )phys_to_bus( mtod(m, void *) )); st_le32( &sc->rx_ring[i].length, XL_LAST_FRAG | XL_PACKET_SIZE ); } sc->curr_rx_md = &sc->rx_ring[0]; @@ -2181,7 +2181,7 @@ elnk_initialize_hardware (struct elnk_softc *sc) for(i=0 ; i<sc->numTxbuffers; i++) { - if( ((unsigned32)&sc->tx_ring[i] & 0x7) ) + if( ((uint32_t )&sc->tx_ring[i] & 0x7) ) { rtems_panic ("etherlink : unit elnk%d tx ring entry %d not aligned to 8 bytes\n", sc->xl_unit, i ); } @@ -2327,7 +2327,7 @@ elnk_rxDaemon (void *arg) m->m_pkthdr.rcvif = ifp; rmd->mbuf = m; st_le32( &rmd->status, 0 ); - st_le32( &rmd->addr, (unsigned32)phys_to_bus(mtod(m, void *)) ); + st_le32( &rmd->addr, (uint32_t )phys_to_bus(mtod(m, void *)) ); } else { @@ -2415,7 +2415,7 @@ elnk_txDaemon (void *arg) */ { struct TXMD *chainhead, *chaintail; - unsigned32 esize; + uint32_t esize; if( rtems_message_queue_receive( chainRecoveryQueue, &chainhead, &esize, RTEMS_NO_WAIT, 0) == RTEMS_SUCCESSFUL ) @@ -2475,7 +2475,7 @@ elnk_txDaemon (void *arg) for(i=0; i< NUM_FRAGS; i++) { st_le32( &nextmd->txfrags[i].length, ((m->m_next)?0:XL_LAST_FRAG) | ( m->m_len & XL_TXSTAT_LENMASK) ); - st_le32( &nextmd->txfrags[i].addr, (unsigned32)phys_to_bus( m->m_data ) ); + st_le32( &nextmd->txfrags[i].addr, (uint32_t )phys_to_bus( m->m_data ) ); if ((m = m->m_next) == NULL) break; } @@ -2491,7 +2491,7 @@ elnk_txDaemon (void *arg) { char *pkt = bus_to_phys( ld_le32( &nextmd->txfrags[i].addr )), *delim; int i; - printk("unit %d queued pkt (%08x) ", sc->xl_unit, (unsigned32)pkt ); + printk("unit %d queued pkt (%08x) ", sc->xl_unit, (uint32_t )pkt ); for(delim="", i=0; i < sizeof(struct ether_header); i++, delim=":") printk("%s%02x", delim, (char) pkt[i] ); printk("\n"); @@ -2522,7 +2522,7 @@ elnk_txDaemon (void *arg) else { /* hook this packet to the previous one */ - st_le32( &lastmd->next, (unsigned32)phys_to_bus( nextmd )); + st_le32( &lastmd->next, (uint32_t )phys_to_bus( nextmd )); } ++chainCount; @@ -2574,7 +2574,7 @@ elnk_txDaemon (void *arg) printk("unit %d queued %d pkts, lastpkt status %08X\n", sc->xl_unit, chainCount, - (unsigned32)ld_le32( &lastmd->status) ); + (uint32_t )ld_le32( &lastmd->status) ); #endif if( sc->tx_idle == 0 && CSR_READ_4(sc, XL_DOWNLIST_PTR) == 0 ) @@ -2657,7 +2657,7 @@ elnk_init (void *arg) sc->tx_idle = -1; { - unsigned32 cr,sr; + uint32_t cr,sr; xl_miibus_writereg(sc, 0x18, MII_BMCR, BMCR_RESET ); @@ -2927,7 +2927,7 @@ elnk_stop (struct elnk_softc *sc) */ { struct TXMD *chainhead; - unsigned32 esize; + uint32_t esize; while( rtems_message_queue_receive( chainRecoveryQueue, &chainhead, &esize, RTEMS_NO_WAIT, 0) == RTEMS_SUCCESSFUL ); @@ -3329,7 +3329,7 @@ rtems_elnk_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) */ pci_write_config_word(pbus, pdev, pfun, PCI_COMMAND, - (unsigned16)( PCI_COMMAND_IO | + (uint16_t )( PCI_COMMAND_IO | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE | PCI_COMMAND_WAIT ) ); @@ -3340,7 +3340,7 @@ rtems_elnk_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) PCI_BASE_ADDRESS_0, &lvalue); - sc->ioaddr = (unsigned32)lvalue & PCI_BASE_ADDRESS_IO_MASK; + sc->ioaddr = (uint32_t )lvalue & PCI_BASE_ADDRESS_IO_MASK; /* ** Store the interrupt name, we'll use it later when we initialize ** the board. @@ -3360,8 +3360,8 @@ rtems_elnk_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) */ { - unsigned8 pci_latency; - unsigned8 new_latency = 248; + uint8_t pci_latency; + uint8_t new_latency = 248; /* Check the PCI latency value. On the 3c590 series the latency timer must be set to the maximum value to avoid data corruption that occurs diff --git a/c/src/libchip/network/if_fxp.c b/c/src/libchip/network/if_fxp.c index 4311a756d7..e7edbbdbe5 100644 --- a/c/src/libchip/network/if_fxp.c +++ b/c/src/libchip/network/if_fxp.c @@ -76,7 +76,7 @@ #include <bsp.h> #include <pcibios.h> #include <irq.h> -#include "pci.h" +#include <rtems/pci.h> #ifdef NS #include <netns/ns.h> diff --git a/c/src/libchip/network/open_eth.c b/c/src/libchip/network/open_eth.c index 3f61b9f4d1..c4d057660f 100644 --- a/c/src/libchip/network/open_eth.c +++ b/c/src/libchip/network/open_eth.c @@ -162,7 +162,7 @@ static struct open_eth_softc oc; static rtems_isr open_eth_interrupt_handler (rtems_vector_number v) { - unsigned32 status; + uint32_t status; /* read and clear interrupt cause */ @@ -190,7 +190,7 @@ open_eth_interrupt_handler (rtems_vector_number v) */ } -static unsigned32 read_mii(unsigned32 addr) +static uint32_t read_mii(uint32_t addr) { while (oc.regs->miistatus & OETH_MIISTATUS_BUSY) {} oc.regs->miiaddress = addr << 8; @@ -204,7 +204,7 @@ static unsigned32 read_mii(unsigned32 addr) } } -static void write_mii(unsigned32 addr, unsigned32 data) +static void write_mii(uint32_t addr, uint32_t data) { while (oc.regs->miistatus & OETH_MIISTATUS_BUSY) {} oc.regs->miiaddress = addr << 8; @@ -300,7 +300,7 @@ open_eth_initialize_hardware (struct open_eth_softc *sc) MCLGET (m, M_WAIT); m->m_pkthdr.rcvif = &sc->arpcom.ac_if; sc->rxdesc[i].m = m; - sc->regs->xd[i + sc->txbufs].addr = mtod (m, unsigned32 *); + sc->regs->xd[i + sc->txbufs].addr = mtod (m, uint32_t *); sc->regs->xd[i + sc->txbufs].len_status = OETH_RX_BD_EMPTY | OETH_RX_BD_IRQ; #ifdef OPEN_ETH_DEBUG @@ -418,7 +418,7 @@ open_eth_rxDaemon (void *arg) m->m_pkthdr.rcvif = ifp; dp->rxdesc[dp->rx_ptr].m = m; dp->regs->xd[dp->rx_ptr + dp->txbufs].addr = - (unsigned32 *) mtod (m, void *); + (uint32_t *) mtod (m, void *); dp->rxPackets++; } @@ -458,7 +458,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m) len = 0; temp = (unsigned char *) dp->txdesc[dp->tx_ptr].buf; - dp->regs->xd[dp->tx_ptr].addr = (unsigned32 *) temp; + dp->regs->xd[dp->tx_ptr].addr = (uint32_t *) temp; #ifdef OPEN_ETH_DEBUG printf("TXD: 0x%08x\n", (int) m->m_data); diff --git a/c/src/libchip/network/open_eth.h b/c/src/libchip/network/open_eth.h index ca41dbe7df..4cc5d31207 100644 --- a/c/src/libchip/network/open_eth.h +++ b/c/src/libchip/network/open_eth.h @@ -8,45 +8,45 @@ /* Configuration Information */ typedef struct { - unsigned32 base_address; - unsigned32 vector; - unsigned32 txd_count; - unsigned32 rxd_count; + uint32_t base_address; + uint32_t vector; + uint32_t txd_count; + uint32_t rxd_count; } open_eth_configuration_t; /* Ethernet buffer descriptor */ typedef struct _oeth_rxtxdesc { - volatile unsigned32 len_status; /* Length and status */ - volatile unsigned32 *addr; /* Buffer pointer */ + volatile uint32_t len_status; /* Length and status */ + volatile uint32_t *addr; /* Buffer pointer */ } oeth_rxtxdesc; /* Ethernet configuration registers */ typedef struct _oeth_regs { - volatile unsigned32 moder; /* Mode Register */ - volatile unsigned32 int_src; /* Interrupt Source Register */ - volatile unsigned32 int_mask; /* Interrupt Mask Register */ - volatile unsigned32 ipgt; /* Back to Bak Inter Packet Gap Register */ - volatile unsigned32 ipgr1; /* Non Back to Back Inter Packet Gap Register 1 */ - volatile unsigned32 ipgr2; /* Non Back to Back Inter Packet Gap Register 2 */ - volatile unsigned32 packet_len; /* Packet Length Register (min. and max.) */ - volatile unsigned32 collconf; /* Collision and Retry Configuration Register */ - volatile unsigned32 tx_bd_num; /* Transmit Buffer Descriptor Number Register */ - volatile unsigned32 ctrlmoder; /* Control Module Mode Register */ - volatile unsigned32 miimoder; /* MII Mode Register */ - volatile unsigned32 miicommand; /* MII Command Register */ - volatile unsigned32 miiaddress; /* MII Address Register */ - volatile unsigned32 miitx_data; /* MII Transmit Data Register */ - volatile unsigned32 miirx_data; /* MII Receive Data Register */ - volatile unsigned32 miistatus; /* MII Status Register */ - volatile unsigned32 mac_addr0; /* MAC Individual Address Register 0 */ - volatile unsigned32 mac_addr1; /* MAC Individual Address Register 1 */ - volatile unsigned32 hash_addr0; /* Hash Register 0 */ - volatile unsigned32 hash_addr1; /* Hash Register 1 */ - volatile unsigned32 txctrl; /* Transmitter control register */ - unsigned32 empty[235]; /* Unused space */ + volatile uint32_t moder; /* Mode Register */ + volatile uint32_t int_src; /* Interrupt Source Register */ + volatile uint32_t int_mask; /* Interrupt Mask Register */ + volatile uint32_t ipgt; /* Back to Bak Inter Packet Gap Register */ + volatile uint32_t ipgr1; /* Non Back to Back Inter Packet Gap Register 1 */ + volatile uint32_t ipgr2; /* Non Back to Back Inter Packet Gap Register 2 */ + volatile uint32_t packet_len; /* Packet Length Register (min. and max.) */ + volatile uint32_t collconf; /* Collision and Retry Configuration Register */ + volatile uint32_t tx_bd_num; /* Transmit Buffer Descriptor Number Register */ + volatile uint32_t ctrlmoder; /* Control Module Mode Register */ + volatile uint32_t miimoder; /* MII Mode Register */ + volatile uint32_t miicommand; /* MII Command Register */ + volatile uint32_t miiaddress; /* MII Address Register */ + volatile uint32_t miitx_data; /* MII Transmit Data Register */ + volatile uint32_t miirx_data; /* MII Receive Data Register */ + volatile uint32_t miistatus; /* MII Status Register */ + volatile uint32_t mac_addr0; /* MAC Individual Address Register 0 */ + volatile uint32_t mac_addr1; /* MAC Individual Address Register 1 */ + volatile uint32_t hash_addr0; /* Hash Register 0 */ + volatile uint32_t hash_addr1; /* Hash Register 1 */ + volatile uint32_t txctrl; /* Transmitter control register */ + uint32_t empty[235]; /* Unused space */ oeth_rxtxdesc xd[128]; /* TX & RX descriptors */ } oeth_regs; diff --git a/c/src/libchip/network/sonic.c b/c/src/libchip/network/sonic.c index 03bdf21586..7c2216d708 100644 --- a/c/src/libchip/network/sonic.c +++ b/c/src/libchip/network/sonic.c @@ -58,7 +58,7 @@ * XXX fix this */ -void *set_vector(void *, unsigned32, unsigned32); +void *set_vector(void *, uint32_t , uint32_t ); #if (SONIC_DEBUG & SONIC_DEBUG_DUMP_MBUFS) #include <rtems/dumpbuf.h> @@ -116,9 +116,9 @@ void *set_vector(void *, unsigned32, unsigned32); /* * Macros for manipulating 32-bit pointers as 16-bit fragments */ -#define LSW(p) ((rtems_unsigned16)((rtems_unsigned32)(p))) -#define MSW(p) ((rtems_unsigned16)((rtems_unsigned32)(p) >> 16)) -#define PTR(m,l) ((void*)(((rtems_unsigned16)(m)<<16)|(rtems_unsigned16)(l))) +#define LSW(p) ((uint16_t )((uint32_t )(p))) +#define MSW(p) ((uint16_t )((uint32_t )(p) >> 16)) +#define PTR(m,l) ((void*)(((uint16_t )(m)<<16)|(uint16_t )(l))) /* * Hardware-specific storage @@ -151,8 +151,8 @@ struct sonic_softc { /* * Data Configuration Register values */ - rtems_unsigned32 dcr_value; - rtems_unsigned32 dc2_value; + uint32_t dcr_value; + uint32_t dc2_value; /* * Indicates configuration @@ -263,7 +263,7 @@ void sonic_print_rx_descriptor( void sonic_enable_interrupts( struct sonic_softc *sc, - unsigned32 mask + uint32_t mask ) { void *rp = sc->sonic; @@ -280,7 +280,7 @@ void sonic_enable_interrupts( void sonic_disable_interrupts( struct sonic_softc *sc, - unsigned32 mask + uint32_t mask ) { void *rp = sc->sonic; @@ -297,7 +297,7 @@ void sonic_disable_interrupts( void sonic_clear_interrupts( struct sonic_softc *sc, - unsigned32 mask + uint32_t mask ) { void *rp = sc->sonic; @@ -310,7 +310,7 @@ void sonic_clear_interrupts( void sonic_command( struct sonic_softc *sc, - unsigned32 mask + uint32_t mask ) { void *rp = sc->sonic; @@ -402,7 +402,7 @@ SONIC_STATIC void sonic_stats (struct sonic_softc *sc) SONIC_STATIC rtems_isr sonic_interrupt_handler (rtems_vector_number v) { struct sonic_softc *sc = sonic_softc; - unsigned32 isr, imr; + uint32_t isr, imr; void *rp; #if (NSONIC > 1) @@ -465,7 +465,7 @@ SONIC_STATIC rtems_isr sonic_interrupt_handler (rtems_vector_number v) SONIC_STATIC void sonic_retire_tda (struct sonic_softc *sc) { - rtems_unsigned16 status; + uint16_t status; unsigned int collisions; struct mbuf *m, *n; @@ -500,7 +500,7 @@ SONIC_STATIC void sonic_retire_tda (struct sonic_softc *sc) * Restart the transmitter if there are * packets waiting to go. */ - rtems_unsigned16 link; + uint16_t link; #if (SONIC_DEBUG & SONIC_DEBUG_ERRORS) printf("restarting sonic after error\n"); #endif @@ -930,10 +930,10 @@ SONIC_STATIC void sonic_rxDaemon (void *arg) struct ifnet *ifp = &sc->arpcom.ac_if; void *rp = sc->sonic; struct mbuf *m; - rtems_unsigned16 status; + uint16_t status; ReceiveDescriptorPointer_t rdp; ReceiveResourcePointer_t rwp, rea; - rtems_unsigned16 newMissedTally, oldMissedTally; + uint16_t newMissedTally, oldMissedTally; rwp = sc->rsa; rea = sc->rea; @@ -985,7 +985,7 @@ SONIC_STATIC void sonic_rxDaemon (void *arg) rdp->byte_count &= 0x0ffff; /* ERC32 pollutes msb of byte_count */ m = rdp->mbufp; m->m_len = m->m_pkthdr.len = rdp->byte_count - - sizeof(rtems_unsigned32) - + sizeof(uint32_t ) - sizeof(struct ether_header); eh = mtod (m, struct ether_header *); m->m_data += sizeof(struct ether_header); diff --git a/c/src/libchip/network/sonic.h b/c/src/libchip/network/sonic.h index bc9367ae08..b4a28ea6d4 100644 --- a/c/src/libchip/network/sonic.h +++ b/c/src/libchip/network/sonic.h @@ -71,22 +71,22 @@ extern char SONIC_Reg_name[64][6]; typedef void (*sonic_write_register_t)( void *base, - unsigned32 regno, - unsigned32 value + uint32_t regno, + uint32_t value ); -typedef unsigned32 (*sonic_read_register_t)( +typedef uint32_t (*sonic_read_register_t)( void *base, - unsigned32 regno + uint32_t regno ); typedef struct { - unsigned32 base_address; - unsigned32 vector; - unsigned32 dcr_value; - unsigned32 dc2_value; - unsigned32 tda_count; - unsigned32 rda_count; + uint32_t base_address; + uint32_t vector; + uint32_t dcr_value; + uint32_t dc2_value; + uint32_t tda_count; + uint32_t rda_count; sonic_write_register_t write_register; sonic_read_register_t read_register; } sonic_configuration_t; @@ -302,32 +302,32 @@ typedef struct { */ #define MAXIMUM_FRAGS_PER_DESCRIPTOR 6 struct TransmitDescriptor { - rtems_unsigned32 status; - rtems_unsigned32 pkt_config; - rtems_unsigned32 pkt_size; - rtems_unsigned32 frag_count; + uint32_t status; + uint32_t pkt_config; + uint32_t pkt_size; + uint32_t frag_count; /* * Packet fragment pointers */ struct TransmitDescriptorFragLink { - rtems_unsigned32 frag_lsw; /* LSW of fragment address */ + uint32_t frag_lsw; /* LSW of fragment address */ #define frag_link frag_lsw - rtems_unsigned32 frag_msw; /* MSW of fragment address */ - rtems_unsigned32 frag_size; + uint32_t frag_msw; /* MSW of fragment address */ + uint32_t frag_size; } frag[MAXIMUM_FRAGS_PER_DESCRIPTOR]; /* * Space for link if all fragment pointers are used. */ - rtems_unsigned32 link_pad; + uint32_t link_pad; /* * Extra RTEMS stuff */ struct TransmitDescriptor *next; /* Circularly-linked list */ struct mbuf *mbufp; /* First mbuf in packet */ - volatile rtems_unsigned32 *linkp; /* Pointer to un[xxx].link */ + volatile uint32_t *linkp; /* Pointer to un[xxx].link */ }; typedef struct TransmitDescriptor TransmitDescriptor_t; typedef volatile TransmitDescriptor_t *TransmitDescriptorPointer_t; @@ -378,10 +378,10 @@ typedef volatile TransmitDescriptor_t *TransmitDescriptorPointer_t; * receive resource entry corresponds to one correctly-received packet. */ struct ReceiveResource { - rtems_unsigned32 buff_ptr_lsw; /* LSW of RBA address */ - rtems_unsigned32 buff_ptr_msw; /* MSW of RBA address */ - rtems_unsigned32 buff_wc_lsw; /* LSW of RBA size (16-bit words) */ - rtems_unsigned32 buff_wc_msw; /* MSW of RBA size (16-bit words) */ + uint32_t buff_ptr_lsw; /* LSW of RBA address */ + uint32_t buff_ptr_msw; /* MSW of RBA address */ + uint32_t buff_wc_lsw; /* LSW of RBA size (16-bit words) */ + uint32_t buff_wc_msw; /* MSW of RBA size (16-bit words) */ }; typedef struct ReceiveResource ReceiveResource_t; typedef volatile ReceiveResource_t *ReceiveResourcePointer_t; @@ -391,13 +391,13 @@ typedef volatile ReceiveResource_t *ReceiveResourcePointer_t; * There is one receive descriptor for each packet received. */ struct ReceiveDescriptor { - rtems_unsigned32 status; - rtems_unsigned32 byte_count; - rtems_unsigned32 pkt_lsw; /* LSW of packet address */ - rtems_unsigned32 pkt_msw; /* MSW of packet address */ - rtems_unsigned32 seq_no; - rtems_unsigned32 link; - rtems_unsigned32 in_use; + uint32_t status; + uint32_t byte_count; + uint32_t pkt_lsw; /* LSW of packet address */ + uint32_t pkt_msw; /* MSW of packet address */ + uint32_t seq_no; + uint32_t link; + uint32_t in_use; /* * Extra RTEMS stuff @@ -409,11 +409,11 @@ typedef struct ReceiveDescriptor ReceiveDescriptor_t; typedef volatile ReceiveDescriptor_t *ReceiveDescriptorPointer_t; typedef struct { - rtems_unsigned32 cep; /* CAM Entry Pointer */ - rtems_unsigned32 cap0; /* CAM Address Port 0 xx-xx-xx-xx-YY-YY */ - rtems_unsigned32 cap1; /* CAM Address Port 1 xx-xx-YY-YY-xxxx */ - rtems_unsigned32 cap2; /* CAM Address Port 2 YY-YY-xx-xx-xx-xx */ - rtems_unsigned32 ce; + uint32_t cep; /* CAM Entry Pointer */ + uint32_t cap0; /* CAM Address Port 0 xx-xx-xx-xx-YY-YY */ + uint32_t cap1; /* CAM Address Port 1 xx-xx-YY-YY-xxxx */ + uint32_t cap2; /* CAM Address Port 2 YY-YY-xx-xx-xx-xx */ + uint32_t ce; } CamDescriptor_t; typedef volatile CamDescriptor_t *CamDescriptorPointer_t; diff --git a/c/src/libchip/rtc/icm7170.c b/c/src/libchip/rtc/icm7170.c index ba093e06c6..4bc7a0e000 100644 --- a/c/src/libchip/rtc/icm7170.c +++ b/c/src/libchip/rtc/icm7170.c @@ -41,9 +41,9 @@ void icm7170_initialize( int minor ) { - unsigned32 icm7170; + uint32_t icm7170; setRegister_f setReg; - unsigned32 clock; + uint32_t clock; icm7170 = RTC_Table[ minor ].ulCtrlPort1; setReg = RTC_Table[ minor ].setRegister; @@ -52,7 +52,7 @@ void icm7170_initialize( * Initialize the RTC with the proper clock frequency */ - clock = (unsigned32) RTC_Table[ minor ].pDeviceParams; + clock = (uint32_t ) RTC_Table[ minor ].pDeviceParams; (*setReg)( icm7170, ICM7170_CONTROL, 0x0c | clock ); } @@ -65,10 +65,10 @@ int icm7170_get_time( rtems_time_of_day *time ) { - unsigned32 icm7170; + uint32_t icm7170; getRegister_f getReg; setRegister_f setReg; - unsigned32 year; + uint32_t year; icm7170 = RTC_Table[ minor ].ulCtrlPort1; getReg = RTC_Table[ minor ].getRegister; @@ -118,16 +118,16 @@ int icm7170_set_time( rtems_time_of_day *time ) { - unsigned32 icm7170; + uint32_t icm7170; getRegister_f getReg; setRegister_f setReg; - unsigned32 year; - unsigned32 clock; + uint32_t year; + uint32_t clock; icm7170 = RTC_Table[ minor ].ulCtrlPort1; getReg = RTC_Table[ minor ].getRegister; setReg = RTC_Table[ minor ].setRegister; - clock = (unsigned32) RTC_Table[ minor ].pDeviceParams; + clock = (uint32_t ) RTC_Table[ minor ].pDeviceParams; year = time->year; diff --git a/c/src/libchip/rtc/icm7170.h b/c/src/libchip/rtc/icm7170.h index de672699df..743cb89b04 100644 --- a/c/src/libchip/rtc/icm7170.h +++ b/c/src/libchip/rtc/icm7170.h @@ -51,48 +51,48 @@ extern rtc_fns icm7170_fns; * Default register access routines */ -unsigned32 icm7170_get_register( /* registers are at 1 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint32_t icm7170_get_register( /* registers are at 1 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void icm7170_set_register( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned32 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint32_t ucData ); -unsigned32 icm7170_get_register_2( /* registers are at 2 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint32_t icm7170_get_register_2( /* registers are at 2 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void icm7170_set_register_2( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned32 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint32_t ucData ); -unsigned32 icm7170_get_register_4( /* registers are at 4 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint32_t icm7170_get_register_4( /* registers are at 4 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void icm7170_set_register_4( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned32 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint32_t ucData ); -unsigned32 icm7170_get_register_8( /* registers are at 8 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint32_t icm7170_get_register_8( /* registers are at 8 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void icm7170_set_register_8( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned32 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint32_t ucData ); #endif diff --git a/c/src/libchip/rtc/icm7170_reg.c b/c/src/libchip/rtc/icm7170_reg.c index 13a8b8e6d1..cf96917100 100644 --- a/c/src/libchip/rtc/icm7170_reg.c +++ b/c/src/libchip/rtc/icm7170_reg.c @@ -20,7 +20,7 @@ #ifndef _ICM7170_MULTIPLIER #define _ICM7170_MULTIPLIER 1 #define _ICM7170_NAME(_X) _X -#define _ICM7170_TYPE unsigned8 +#define _ICM7170_TYPE uint8_t #endif #define CALCULATE_REGISTER_ADDRESS( _base, _reg ) \ @@ -30,9 +30,9 @@ * ICM7170 Get Register Routine */ -unsigned32 _ICM7170_NAME(icm7170_get_register)( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum +uint32_t _ICM7170_NAME(icm7170_get_register)( + uint32_t ulCtrlPort, + uint8_t ucRegNum ) { _ICM7170_TYPE *port; @@ -47,9 +47,9 @@ unsigned32 _ICM7170_NAME(icm7170_get_register)( */ void _ICM7170_NAME(icm7170_set_register)( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned32 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint32_t ucData ) { _ICM7170_TYPE *port; diff --git a/c/src/libchip/rtc/icm7170_reg2.c b/c/src/libchip/rtc/icm7170_reg2.c index e4cf343c0b..4ecdd100a9 100644 --- a/c/src/libchip/rtc/icm7170_reg2.c +++ b/c/src/libchip/rtc/icm7170_reg2.c @@ -17,7 +17,7 @@ #define _ICM7170_MULTIPLIER 2 #define _ICM7170_NAME(_X) _X##_2 -#define _ICM7170_TYPE unsigned8 +#define _ICM7170_TYPE uint8_t #include "icm7170_reg.c" diff --git a/c/src/libchip/rtc/icm7170_reg4.c b/c/src/libchip/rtc/icm7170_reg4.c index 95daa503b0..33e7b9332a 100644 --- a/c/src/libchip/rtc/icm7170_reg4.c +++ b/c/src/libchip/rtc/icm7170_reg4.c @@ -17,7 +17,7 @@ #define _ICM7170_MULTIPLIER 4 #define _ICM7170_NAME(_X) _X##_4 -#define _ICM7170_TYPE unsigned8 +#define _ICM7170_TYPE uint8_t #include "icm7170_reg.c" diff --git a/c/src/libchip/rtc/icm7170_reg8.c b/c/src/libchip/rtc/icm7170_reg8.c index fdc28be79b..aadc378359 100644 --- a/c/src/libchip/rtc/icm7170_reg8.c +++ b/c/src/libchip/rtc/icm7170_reg8.c @@ -17,7 +17,7 @@ #define _ICM7170_MULTIPLIER 8 #define _ICM7170_NAME(_X) _X##_8 -#define _ICM7170_TYPE unsigned8 +#define _ICM7170_TYPE uint8_t #include "icm7170_reg.c" diff --git a/c/src/libchip/rtc/m48t08.c b/c/src/libchip/rtc/m48t08.c index eac6db1655..3359fa631b 100644 --- a/c/src/libchip/rtc/m48t08.c +++ b/c/src/libchip/rtc/m48t08.c @@ -57,12 +57,12 @@ int m48t08_get_time( rtems_time_of_day *time ) { - unsigned32 m48t08; + uint32_t m48t08; getRegister_f getReg; setRegister_f setReg; - unsigned8 controlReg; - unsigned32 value1; - unsigned32 value2; + uint8_t controlReg; + uint32_t value1; + uint32_t value2; m48t08 = RTC_Table[ minor ].ulCtrlPort1; getReg = RTC_Table[ minor ].getRegister; @@ -117,10 +117,10 @@ int m48t08_set_time( rtems_time_of_day *time ) { - unsigned32 m48t08; + uint32_t m48t08; getRegister_f getReg; setRegister_f setReg; - unsigned8 controlReg; + uint8_t controlReg; m48t08 = RTC_Table[ minor ].ulCtrlPort1; getReg = RTC_Table[ minor ].getRegister; diff --git a/c/src/libchip/rtc/m48t08.h b/c/src/libchip/rtc/m48t08.h index b4e22ace5e..496d288ab7 100644 --- a/c/src/libchip/rtc/m48t08.h +++ b/c/src/libchip/rtc/m48t08.h @@ -41,48 +41,48 @@ extern rtc_fns m48t08_fns; * Default register access routines */ -unsigned32 m48t08_get_register( /* registers are at 1 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint32_t m48t08_get_register( /* registers are at 1 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void m48t08_set_register( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned32 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint32_t ucData ); -unsigned32 m48t08_get_register_2( /* registers are at 2 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint32_t m48t08_get_register_2( /* registers are at 2 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void m48t08_set_register_2( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned32 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint32_t ucData ); -unsigned32 m48t08_get_register_4( /* registers are at 4 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint32_t m48t08_get_register_4( /* registers are at 4 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void m48t08_set_register_4( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned32 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint32_t ucData ); -unsigned32 m48t08_get_register_8( /* registers are at 8 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint32_t m48t08_get_register_8( /* registers are at 8 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void m48t08_set_register_8( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned32 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint32_t ucData ); #endif diff --git a/c/src/libchip/rtc/m48t08_reg.c b/c/src/libchip/rtc/m48t08_reg.c index 7e0063c22e..32eecaac7a 100644 --- a/c/src/libchip/rtc/m48t08_reg.c +++ b/c/src/libchip/rtc/m48t08_reg.c @@ -20,7 +20,7 @@ #ifndef _M48T08_MULTIPLIER #define _M48T08_MULTIPLIER 1 #define _M48T08_NAME(_X) _X -#define _M48T08_TYPE unsigned8 +#define _M48T08_TYPE uint8_t #endif #define CALCULATE_REGISTER_ADDRESS( _base, _reg ) \ @@ -30,9 +30,9 @@ * M48T08 Get Register Routine */ -unsigned32 _M48T08_NAME(m48t08_get_register)( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum +uint32_t _M48T08_NAME(m48t08_get_register)( + uint32_t ulCtrlPort, + uint8_t ucRegNum ) { _M48T08_TYPE *port; @@ -47,9 +47,9 @@ unsigned32 _M48T08_NAME(m48t08_get_register)( */ void _M48T08_NAME(m48t08_set_register)( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned32 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint32_t ucData ) { _M48T08_TYPE *port; diff --git a/c/src/libchip/rtc/m48t08_reg2.c b/c/src/libchip/rtc/m48t08_reg2.c index 3fa2c63003..e83e998783 100644 --- a/c/src/libchip/rtc/m48t08_reg2.c +++ b/c/src/libchip/rtc/m48t08_reg2.c @@ -17,7 +17,7 @@ #define _M48T08_MULTIPLIER 2 #define _M48T08_NAME(_X) _X##_2 -#define _M48T08_TYPE unsigned8 +#define _M48T08_TYPE uint8_t #include "m48t08_reg.c" diff --git a/c/src/libchip/rtc/m48t08_reg4.c b/c/src/libchip/rtc/m48t08_reg4.c index d8b68ddbc0..a2f877d8d9 100644 --- a/c/src/libchip/rtc/m48t08_reg4.c +++ b/c/src/libchip/rtc/m48t08_reg4.c @@ -17,7 +17,7 @@ #define _M48T08_MULTIPLIER 4 #define _M48T08_NAME(_X) _X##_4 -#define _M48T08_TYPE unsigned8 +#define _M48T08_TYPE uint8_t #include "m48t08_reg.c" diff --git a/c/src/libchip/rtc/m48t08_reg8.c b/c/src/libchip/rtc/m48t08_reg8.c index a4a132ce87..1d4da06b31 100644 --- a/c/src/libchip/rtc/m48t08_reg8.c +++ b/c/src/libchip/rtc/m48t08_reg8.c @@ -17,7 +17,7 @@ #define _M48T08_MULTIPLIER 8 #define _M48T08_NAME(_X) _X##_8 -#define _M48T08_TYPE unsigned8 +#define _M48T08_TYPE uint8_t #include "m48t08_reg.c" diff --git a/c/src/libchip/rtc/rtc.h b/c/src/libchip/rtc/rtc.h index 1f302712fc..39dd5981b1 100644 --- a/c/src/libchip/rtc/rtc.h +++ b/c/src/libchip/rtc/rtc.h @@ -19,9 +19,9 @@ * Types for get and set register routines */ -typedef unsigned32 (*getRegister_f)(unsigned32 port, unsigned8 register); +typedef uint32_t (*getRegister_f)(uint32_t port, uint8_t register); typedef void (*setRegister_f)( - unsigned32 port, unsigned8 reg, unsigned32 value); + uint32_t port, uint8_t reg, uint32_t value); typedef struct _rtc_fns { void (*deviceInitialize)(int minor); @@ -64,8 +64,8 @@ typedef struct _rtc_tbl { rtc_fns *pDeviceFns; boolean (*deviceProbe)(int minor); void *pDeviceParams; - unsigned32 ulCtrlPort1; - unsigned32 ulDataPort; + uint32_t ulCtrlPort1; + uint32_t ulDataPort; getRegister_f getRegister; setRegister_f setRegister; } rtc_tbl; diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c index 72935367a4..83cf6cbb37 100644 --- a/c/src/libchip/serial/mc68681.c +++ b/c/src/libchip/serial/mc68681.c @@ -89,8 +89,8 @@ MC68681_STATIC int mc68681_set_attributes( const struct termios *t ) { - unsigned32 pMC68681_port; - unsigned32 pMC68681; + uint32_t pMC68681_port; + uint32_t pMC68681; unsigned int mode1; unsigned int mode2; unsigned int baud_mask; @@ -219,8 +219,8 @@ MC68681_STATIC void mc68681_initialize_context( MC68681_STATIC void mc68681_init(int minor) { - unsigned32 pMC68681_port; - unsigned32 pMC68681; + uint32_t pMC68681_port; + uint32_t pMC68681; mc68681_context *pmc68681Context; setRegister_f setReg; getRegister_f getReg; @@ -273,8 +273,8 @@ MC68681_STATIC int mc68681_open( void *arg ) { - unsigned32 pMC68681; - unsigned32 pMC68681_port; + uint32_t pMC68681; + uint32_t pMC68681_port; unsigned int baud; unsigned int acr_bit; unsigned int vector; @@ -330,8 +330,8 @@ MC68681_STATIC int mc68681_close( void *arg ) { - unsigned32 pMC68681; - unsigned32 pMC68681_port; + uint32_t pMC68681; + uint32_t pMC68681_port; setRegister_f setReg; pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1; @@ -361,7 +361,7 @@ MC68681_STATIC void mc68681_write_polled( char cChar ) { - unsigned32 pMC68681_port; + uint32_t pMC68681_port; unsigned char ucLineStatus; int iTimeout; getRegister_f getReg; @@ -454,8 +454,8 @@ MC68681_STATIC int mc68681_write_support_int( int len ) { - unsigned32 Irql; - unsigned32 pMC68681_port; + uint32_t Irql; + uint32_t pMC68681_port; setRegister_f setReg; pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2; @@ -526,7 +526,7 @@ MC68681_STATIC int mc68681_inbyte_nonblocking_polled( int minor ) { - unsigned32 pMC68681_port; + uint32_t pMC68681_port; unsigned char ucLineStatus; unsigned char cChar; getRegister_f getReg; @@ -623,10 +623,10 @@ MC68681_STATIC void mc68681_process( int minor ) { - unsigned32 pMC68681; - unsigned32 pMC68681_port; - volatile unsigned8 ucLineStatus; - volatile unsigned8 ucISRStatus; + uint32_t pMC68681; + uint32_t pMC68681_port; + volatile uint8_t ucLineStatus; + volatile uint8_t ucISRStatus; unsigned char cChar; getRegister_f getReg; setRegister_f setReg; @@ -762,7 +762,7 @@ MC68681_STATIC void mc68681_enable_interrupts( int imr_mask ) { - unsigned32 pMC68681; + uint32_t pMC68681; setRegister_f setReg; pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1; diff --git a/c/src/libchip/serial/mc68681.h b/c/src/libchip/serial/mc68681.h index 07820573a4..8b21cee0ce 100644 --- a/c/src/libchip/serial/mc68681.h +++ b/c/src/libchip/serial/mc68681.h @@ -70,48 +70,48 @@ extern console_fns mc68681_fns_polled; * Default register access routines */ -unsigned8 mc68681_get_register( /* registers are at 1 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint8_t mc68681_get_register( /* registers are at 1 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void mc68681_set_register( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned8 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint8_t ucData ); -unsigned8 mc68681_get_register_2( /* registers are at 2 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint8_t mc68681_get_register_2( /* registers are at 2 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void mc68681_set_register_2( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned8 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint8_t ucData ); -unsigned8 mc68681_get_register_4( /* registers are at 4 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint8_t mc68681_get_register_4( /* registers are at 4 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void mc68681_set_register_4( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned8 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint8_t ucData ); -unsigned8 mc68681_get_register_8( /* registers are at 8 byte boundaries */ - unsigned32 ulCtrlPort, /* and accessed as bytes */ - unsigned8 ucRegNum +uint8_t mc68681_get_register_8( /* registers are at 8 byte boundaries */ + uint32_t ulCtrlPort, /* and accessed as bytes */ + uint8_t ucRegNum ); void mc68681_set_register_8( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned8 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint8_t ucData ); diff --git a/c/src/libchip/serial/mc68681_reg.c b/c/src/libchip/serial/mc68681_reg.c index 76c2dfdc33..bf6e2d3254 100644 --- a/c/src/libchip/serial/mc68681_reg.c +++ b/c/src/libchip/serial/mc68681_reg.c @@ -20,7 +20,7 @@ #ifndef _MC68681_MULTIPLIER #define _MC68681_MULTIPLIER 1 #define _MC68681_NAME(_X) _X -#define _MC68681_TYPE unsigned8 +#define _MC68681_TYPE uint8_t #endif #define CALCULATE_REGISTER_ADDRESS( _base, _reg ) \ @@ -30,9 +30,9 @@ * MC68681 Get Register Routine */ -unsigned8 _MC68681_NAME(mc68681_get_register)( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum +uint8_t _MC68681_NAME(mc68681_get_register)( + uint32_t ulCtrlPort, + uint8_t ucRegNum ) { _MC68681_TYPE *port; @@ -47,9 +47,9 @@ unsigned8 _MC68681_NAME(mc68681_get_register)( */ void _MC68681_NAME(mc68681_set_register)( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned8 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint8_t ucData ) { _MC68681_TYPE *port; diff --git a/c/src/libchip/serial/mc68681_reg2.c b/c/src/libchip/serial/mc68681_reg2.c index 5cffddc591..e9cabe97b2 100644 --- a/c/src/libchip/serial/mc68681_reg2.c +++ b/c/src/libchip/serial/mc68681_reg2.c @@ -17,7 +17,7 @@ #define _MC68681_MULTIPLIER 2 #define _MC68681_NAME(_X) _X##_2 -#define _MC68681_TYPE unsigned8 +#define _MC68681_TYPE uint8_t #include "mc68681_reg.c" diff --git a/c/src/libchip/serial/mc68681_reg4.c b/c/src/libchip/serial/mc68681_reg4.c index 3f649b23dc..89ed5c9640 100644 --- a/c/src/libchip/serial/mc68681_reg4.c +++ b/c/src/libchip/serial/mc68681_reg4.c @@ -17,7 +17,7 @@ #define _MC68681_MULTIPLIER 4 #define _MC68681_NAME(_X) _X##_4 -#define _MC68681_TYPE unsigned8 +#define _MC68681_TYPE uint8_t #include "mc68681_reg.c" diff --git a/c/src/libchip/serial/mc68681_reg8.c b/c/src/libchip/serial/mc68681_reg8.c index 5cf9517370..380f3a8362 100644 --- a/c/src/libchip/serial/mc68681_reg8.c +++ b/c/src/libchip/serial/mc68681_reg8.c @@ -17,7 +17,7 @@ #define _MC68681_MULTIPLIER 8 #define _MC68681_NAME(_X) _X##_8 -#define _MC68681_TYPE unsigned8 +#define _MC68681_TYPE uint8_t #include "mc68681_reg.c" diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c index 0fd106d6e7..678219cfd0 100644 --- a/c/src/libchip/serial/ns16550.c +++ b/c/src/libchip/serial/ns16550.c @@ -75,10 +75,10 @@ extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); NS16550_STATIC void ns16550_init(int minor) { - unsigned32 pNS16550; - unsigned8 ucTrash; - unsigned8 ucDataByte; - unsigned32 ulBaudDivisor; + uint32_t pNS16550; + uint8_t ucTrash; + uint8_t ucDataByte; + uint32_t ulBaudDivisor; ns16550_context *pns16550Context; setRegister_f setReg; getRegister_f getReg; @@ -103,8 +103,8 @@ NS16550_STATIC void ns16550_init(int minor) /* Set the divisor latch and set the baud rate. */ ulBaudDivisor = NS16550_Baud( - (unsigned32) Console_Port_Tbl[minor].ulClock, - (unsigned32) Console_Port_Tbl[minor].pDeviceParams + (uint32_t ) Console_Port_Tbl[minor].ulClock, + (uint32_t ) Console_Port_Tbl[minor].pDeviceParams ); ucDataByte = SP_LINE_DLAB; (*setReg)(pNS16550, NS16550_LINE_CONTROL, ucDataByte); @@ -185,7 +185,7 @@ NS16550_STATIC void ns16550_write_polled( char cChar ) { - unsigned32 pNS16550; + uint32_t pNS16550; unsigned char ucLineStatus; int iTimeout; getRegister_f getReg; @@ -231,8 +231,8 @@ NS16550_STATIC void ns16550_write_polled( NS16550_STATIC int ns16550_assert_RTS(int minor) { - unsigned32 pNS16550; - unsigned32 Irql; + uint32_t pNS16550; + uint32_t Irql; ns16550_context *pns16550Context; setRegister_f setReg; @@ -257,8 +257,8 @@ NS16550_STATIC int ns16550_assert_RTS(int minor) NS16550_STATIC int ns16550_negate_RTS(int minor) { - unsigned32 pNS16550; - unsigned32 Irql; + uint32_t pNS16550; + uint32_t Irql; ns16550_context *pns16550Context; setRegister_f setReg; @@ -288,8 +288,8 @@ NS16550_STATIC int ns16550_negate_RTS(int minor) NS16550_STATIC int ns16550_assert_DTR(int minor) { - unsigned32 pNS16550; - unsigned32 Irql; + uint32_t pNS16550; + uint32_t Irql; ns16550_context *pns16550Context; setRegister_f setReg; @@ -314,8 +314,8 @@ NS16550_STATIC int ns16550_assert_DTR(int minor) NS16550_STATIC int ns16550_negate_DTR(int minor) { - unsigned32 pNS16550; - unsigned32 Irql; + uint32_t pNS16550; + uint32_t Irql; ns16550_context *pns16550Context; setRegister_f setReg; @@ -346,13 +346,13 @@ NS16550_STATIC int ns16550_set_attributes( const struct termios *t ) { - unsigned32 pNS16550; - unsigned32 ulBaudDivisor; - unsigned8 ucLineControl; - unsigned32 baud_requested; + uint32_t pNS16550; + uint32_t ulBaudDivisor; + uint8_t ucLineControl; + uint32_t baud_requested; setRegister_f setReg; getRegister_f getReg; - unsigned32 Irql; + uint32_t Irql; pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1; setReg = Console_Port_Tbl[minor].setRegister; @@ -367,7 +367,7 @@ NS16550_STATIC int ns16550_set_attributes( baud_requested = B9600; /* default to 9600 baud */ ulBaudDivisor = NS16550_Baud( - (unsigned32) Console_Port_Tbl[minor].ulClock, + (uint32_t ) Console_Port_Tbl[minor].ulClock, termios_baud_to_number(baud_requested) ); @@ -443,9 +443,9 @@ NS16550_STATIC void ns16550_process( int minor ) { - unsigned32 pNS16550; - volatile unsigned8 ucLineStatus; - volatile unsigned8 ucInterruptId; + uint32_t pNS16550; + volatile uint8_t ucLineStatus; + volatile uint8_t ucInterruptId; unsigned char cChar; getRegister_f getReg; setRegister_f setReg; @@ -539,7 +539,7 @@ NS16550_STATIC void ns16550_enable_interrupts( int mask ) { - unsigned32 pNS16550; + uint32_t pNS16550; setRegister_f setReg; pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1; @@ -577,8 +577,8 @@ NS16550_STATIC int ns16550_write_support_int( int len ) { - unsigned32 Irql; - unsigned32 pNS16550; + uint32_t Irql; + uint32_t pNS16550; setRegister_f setReg; setReg = Console_Port_Tbl[minor].setRegister; @@ -649,7 +649,7 @@ NS16550_STATIC int ns16550_inbyte_nonblocking_polled( int minor ) { - unsigned32 pNS16550; + uint32_t pNS16550; unsigned char ucLineStatus; char cChar; getRegister_f getReg; diff --git a/c/src/libchip/serial/ns16550_p.h b/c/src/libchip/serial/ns16550_p.h index 6ed71d9c8b..45112704fe 100644 --- a/c/src/libchip/serial/ns16550_p.h +++ b/c/src/libchip/serial/ns16550_p.h @@ -160,7 +160,7 @@ typedef struct _SP_INTERRUPT_ID { typedef struct _ns16550_context { - unsigned8 ucModemCtrl; + uint8_t ucModemCtrl; } ns16550_context; /* diff --git a/c/src/libchip/serial/serial.h b/c/src/libchip/serial/serial.h index 295a2384da..5cce0820ea 100644 --- a/c/src/libchip/serial/serial.h +++ b/c/src/libchip/serial/serial.h @@ -22,11 +22,11 @@ * Types for get and set register routines */ -typedef unsigned8 (*getRegister_f)(unsigned32 port, unsigned8 register); +typedef uint8_t (*getRegister_f)(uint32_t port, uint8_t register); typedef void (*setRegister_f)( - unsigned32 port, unsigned8 reg, unsigned8 value); -typedef unsigned8 (*getData_f)(unsigned32 port); -typedef void (*setData_f)(unsigned32 port, unsigned8 value); + uint32_t port, uint8_t reg, uint8_t value); +typedef uint8_t (*getData_f)(uint32_t port); +typedef void (*setData_f)(uint32_t port, uint8_t value); typedef struct _console_fns { boolean (*deviceProbe)(int minor); @@ -120,17 +120,17 @@ typedef struct _console_tbl { console_fns *pDeviceFns; boolean (*deviceProbe)(int minor); console_flow *pDeviceFlow; - unsigned32 ulMargin; - unsigned32 ulHysteresis; + uint32_t ulMargin; + uint32_t ulHysteresis; void *pDeviceParams; - unsigned32 ulCtrlPort1; - unsigned32 ulCtrlPort2; - unsigned32 ulDataPort; + uint32_t ulCtrlPort1; + uint32_t ulCtrlPort2; + uint32_t ulDataPort; getRegister_f getRegister; setRegister_f setRegister; getData_f getData; setData_f setData; - unsigned32 ulClock; + uint32_t ulClock; unsigned int ulIntVector; } console_tbl; diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c index 969993e6d0..cd33539bb8 100644 --- a/c/src/libchip/serial/z85c30.c +++ b/c/src/libchip/serial/z85c30.c @@ -92,8 +92,8 @@ Z85C30_STATIC void z85c30_initialize_port( int minor ) { - unsigned32 ulCtrlPort; - unsigned32 ulBaudDivisor; + uint32_t ulCtrlPort; + uint32_t ulBaudDivisor; setRegister_f setReg; ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1; @@ -137,8 +137,8 @@ Z85C30_STATIC void z85c30_initialize_port( ); ulBaudDivisor = Z85C30_Baud( - (unsigned32) Console_Port_Tbl[minor].ulClock, - (unsigned32) Console_Port_Tbl[minor].pDeviceParams + (uint32_t ) Console_Port_Tbl[minor].ulClock, + (uint32_t ) Console_Port_Tbl[minor].pDeviceParams ); /* @@ -253,8 +253,8 @@ Z85C30_STATIC int z85c30_close( Z85C30_STATIC void z85c30_init(int minor) { - unsigned32 ulCtrlPort; - unsigned8 dummy; + uint32_t ulCtrlPort; + uint8_t dummy; z85c30_context *pz85c30Context; setRegister_f setReg; getRegister_f getReg; @@ -430,11 +430,11 @@ Z85C30_STATIC int z85c30_set_attributes( const struct termios *t ) { - unsigned32 ulCtrlPort; - unsigned32 ulBaudDivisor; - unsigned32 wr3; - unsigned32 wr4; - unsigned32 wr5; + uint32_t ulCtrlPort; + uint32_t ulBaudDivisor; + uint32_t wr3; + uint32_t wr4; + uint32_t wr5; int baud_requested; setRegister_f setReg; rtems_interrupt_level Irql; @@ -451,8 +451,8 @@ Z85C30_STATIC int z85c30_set_attributes( baud_requested = B9600; /* default to 9600 baud */ ulBaudDivisor = Z85C30_Baud( - (unsigned32) Console_Port_Tbl[minor].ulClock, - (unsigned32) termios_baud_to_number( baud_requested ) + (uint32_t ) Console_Port_Tbl[minor].ulClock, + (uint32_t ) termios_baud_to_number( baud_requested ) ); wr3 = SCC_WR3_RX_EN; @@ -532,11 +532,11 @@ Z85C30_STATIC int z85c30_set_attributes( Z85C30_STATIC void z85c30_process( int minor, - unsigned8 ucIntPend + uint8_t ucIntPend ) { - unsigned32 ulCtrlPort; - volatile unsigned8 z85c30_status; + uint32_t ulCtrlPort; + volatile uint8_t z85c30_status; unsigned char cChar; setRegister_f setReg; getRegister_f getReg; @@ -641,9 +641,9 @@ Z85C30_STATIC rtems_isr z85c30_isr( ) { int minor; - unsigned32 ulCtrlPort; - volatile unsigned8 ucIntPend; - volatile unsigned8 ucIntPendPort; + uint32_t ulCtrlPort; + volatile uint8_t ucIntPend; + volatile uint8_t ucIntPendPort; getRegister_f getReg; for (minor=0;minor<Console_Port_Count;minor++) { @@ -684,7 +684,7 @@ Z85C30_STATIC void z85c30_enable_interrupts( int interrupt_mask ) { - unsigned32 ulCtrlPort; + uint32_t ulCtrlPort; setRegister_f setReg; ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1; @@ -703,8 +703,8 @@ Z85C30_STATIC void z85c30_initialize_interrupts( int minor ) { - unsigned32 ulCtrlPort1; - unsigned32 ulCtrlPort2; + uint32_t ulCtrlPort1; + uint32_t ulCtrlPort2; setRegister_f setReg; ulCtrlPort1 = Console_Port_Tbl[minor].ulCtrlPort1; @@ -748,8 +748,8 @@ Z85C30_STATIC int z85c30_write_support_int( const char *buf, int len) { - unsigned32 Irql; - unsigned32 ulCtrlPort; + uint32_t Irql; + uint32_t ulCtrlPort; setRegister_f setReg; ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1; @@ -791,8 +791,8 @@ Z85C30_STATIC int z85c30_inbyte_nonblocking_polled( int minor ) { - volatile unsigned8 z85c30_status; - unsigned32 ulCtrlPort; + volatile uint8_t z85c30_status; + uint32_t ulCtrlPort; getRegister_f getReg; ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1; @@ -852,8 +852,8 @@ Z85C30_STATIC void z85c30_write_polled( char cChar ) { - volatile unsigned8 z85c30_status; - unsigned32 ulCtrlPort; + volatile uint8_t z85c30_status; + uint32_t ulCtrlPort; getRegister_f getReg; setRegister_f setReg; diff --git a/c/src/libchip/serial/z85c30.h b/c/src/libchip/serial/z85c30.h index be4edb1222..7f03f0b486 100644 --- a/c/src/libchip/serial/z85c30.h +++ b/c/src/libchip/serial/z85c30.h @@ -50,24 +50,24 @@ extern console_flow z85c30_flow_DTRCTS; * Default register access routines */ -unsigned8 z85c30_get_register( /* registers are byte-wide */ - unsigned32 ulCtrlPort, - unsigned8 ucRegNum +uint8_t z85c30_get_register( /* registers are byte-wide */ + uint32_t ulCtrlPort, + uint8_t ucRegNum ); void z85c30_set_register( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned8 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint8_t ucData ); -unsigned8 z85c30_get_data( - unsigned32 ulDataPort +uint8_t z85c30_get_data( + uint32_t ulDataPort ); void z85c30_set_data( - unsigned32 ulDataPort, - unsigned8 ucData + uint32_t ulDataPort, + uint8_t ucData ); #ifdef __cplusplus diff --git a/c/src/libchip/serial/z85c30_p.h b/c/src/libchip/serial/z85c30_p.h index 1c7e304caa..78f01d9b38 100644 --- a/c/src/libchip/serial/z85c30_p.h +++ b/c/src/libchip/serial/z85c30_p.h @@ -310,7 +310,7 @@ extern "C" { typedef struct _z85c30_context { - unsigned8 ucModemCtrl; + uint8_t ucModemCtrl; } z85c30_context; /* diff --git a/c/src/libchip/serial/z85c30_reg.c b/c/src/libchip/serial/z85c30_reg.c index 5dc310e1c6..1ee47e5818 100644 --- a/c/src/libchip/serial/z85c30_reg.c +++ b/c/src/libchip/serial/z85c30_reg.c @@ -19,20 +19,20 @@ #ifndef _Z85C30_MULTIPLIER #define _Z85C30_MULTIPLIER 1 #define _Z85C30_NAME(_X) _X -#define _Z85C30_TYPE unsigned8 +#define _Z85C30_TYPE uint8_t #endif /* * Z85C30 Get Register Routine */ -unsigned8 _Z85C30_NAME(z85c30_get_register)( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum +uint8_t _Z85C30_NAME(z85c30_get_register)( + uint32_t ulCtrlPort, + uint8_t ucRegNum ) { _Z85C30_TYPE *port; - unsigned8 data; + uint8_t data; rtems_interrupt_level level; port = (_Z85C30_TYPE *)ulCtrlPort; @@ -53,9 +53,9 @@ unsigned8 _Z85C30_NAME(z85c30_get_register)( */ void _Z85C30_NAME(z85c30_set_register)( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned8 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint8_t ucData ) { _Z85C30_TYPE *port; diff --git a/c/src/libchip/shmdr/addlq.c b/c/src/libchip/shmdr/addlq.c index 50a1f07a76..3bda767933 100644 --- a/c/src/libchip/shmdr/addlq.c +++ b/c/src/libchip/shmdr/addlq.c @@ -26,7 +26,7 @@ void Shm_Locked_queue_Add( Shm_Envelope_control *ecb ) { - rtems_unsigned32 index; + uint32_t index; ecb->next = Shm_Locked_queue_End_of_list; ecb->queue = lq_cb->owner; diff --git a/c/src/libchip/shmdr/cnvpkt.c b/c/src/libchip/shmdr/cnvpkt.c index 733ee803c0..697b1c84c6 100644 --- a/c/src/libchip/shmdr/cnvpkt.c +++ b/c/src/libchip/shmdr/cnvpkt.c @@ -30,9 +30,9 @@ void Shm_Convert_packet( rtems_packet_prefix *packet ) { - rtems_unsigned32 *pkt, i; + uint32_t *pkt, i; - pkt = (rtems_unsigned32 *) packet; + pkt = (uint32_t *) packet; for ( i=RTEMS_MINIMUN_HETERO_CONVERSION ; i ; i--, pkt++ ) *pkt = CPU_swap_u32( *pkt ); diff --git a/c/src/libchip/shmdr/dump.c b/c/src/libchip/shmdr/dump.c index 35a6cf58e0..4a122d41cf 100644 --- a/c/src/libchip/shmdr/dump.c +++ b/c/src/libchip/shmdr/dump.c @@ -24,9 +24,9 @@ void Shm_Print_statistics(void) { - rtems_unsigned32 ticks; - rtems_unsigned32 ticks_per_second; - rtems_unsigned32 seconds; + uint32_t ticks; + uint32_t ticks_per_second; + uint32_t seconds; int packets_per_second; (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &ticks ); diff --git a/c/src/libchip/shmdr/fatal.c b/c/src/libchip/shmdr/fatal.c index 7f8558b7bb..b89265da00 100644 --- a/c/src/libchip/shmdr/fatal.c +++ b/c/src/libchip/shmdr/fatal.c @@ -23,7 +23,7 @@ void MPCI_Fatal( Internal_errors_Source source, boolean is_internal, - rtems_unsigned32 error + uint32_t error ) { /* Eventually need to attempt to broadcast a K_FATAL message diff --git a/c/src/libchip/shmdr/getlq.c b/c/src/libchip/shmdr/getlq.c index 543a7f9d5e..337b3a78de 100644 --- a/c/src/libchip/shmdr/getlq.c +++ b/c/src/libchip/shmdr/getlq.c @@ -28,7 +28,7 @@ Shm_Envelope_control *Shm_Locked_queue_Get( ) { Shm_Envelope_control *tmp_ecb; - rtems_unsigned32 tmpfront; + uint32_t tmpfront; tmp_ecb = NULL; Shm_Lock( lq_cb ); diff --git a/c/src/libchip/shmdr/init.c b/c/src/libchip/shmdr/init.c index 033acac1f6..66e3ffba0a 100644 --- a/c/src/libchip/shmdr/init.c +++ b/c/src/libchip/shmdr/init.c @@ -36,12 +36,12 @@ rtems_extensions_table MPCI_Shm_extensions; rtems_mpci_entry Shm_Initialization( void ) { - rtems_unsigned32 i, all_initialized; - rtems_unsigned32 interrupt_cause, interrupt_value; + uint32_t i, all_initialized; + uint32_t interrupt_cause, interrupt_value; void *interrupt_address; Shm_Node_status_control *nscb; - rtems_unsigned32 extension_id; /* for installation of MPCI_Fatal */ - rtems_unsigned32 remaining_memory; + uint32_t extension_id; /* for installation of MPCI_Fatal */ + uint32_t remaining_memory; /* XXX these should use "public" methods to set their values.... */ rtems_configuration_table *configuration = _Configuration_Table; rtems_multiprocessing_table *mp_configuration = _Configuration_MP_table; @@ -122,7 +122,7 @@ rtems_mpci_entry Shm_Initialization( void ) */ interrupt_address = - (void *) Shm_Convert( (rtems_unsigned32)Shm_Configuration->Intr.address ); + (void *) Shm_Convert( (uint32_t )Shm_Configuration->Intr.address ); interrupt_value = Shm_Convert( Shm_Configuration->Intr.value ); interrupt_cause = Shm_Convert( Shm_Configuration->Intr.length ); @@ -172,7 +172,7 @@ rtems_mpci_entry Shm_Initialization( void ) * shared area so other nodes can interrupt us. */ - Shm_Local_node_status->int_address = (rtems_unsigned32) interrupt_address; + Shm_Local_node_status->int_address = (uint32_t ) interrupt_address; Shm_Local_node_status->int_value = interrupt_value; Shm_Local_node_status->int_length = interrupt_cause; @@ -220,7 +220,7 @@ rtems_mpci_entry Shm_Initialization( void ) */ Shm_Local_node_status->int_address = - (rtems_unsigned32) interrupt_address; + (uint32_t ) interrupt_address; Shm_Local_node_status->int_value = interrupt_value; Shm_Local_node_status->int_length = interrupt_cause; diff --git a/c/src/libchip/shmdr/initlq.c b/c/src/libchip/shmdr/initlq.c index 031156a6be..ee7047b2e6 100644 --- a/c/src/libchip/shmdr/initlq.c +++ b/c/src/libchip/shmdr/initlq.c @@ -24,7 +24,7 @@ void Shm_Locked_queue_Initialize( Shm_Locked_queue_Control *lq_cb, - rtems_unsigned32 owner + uint32_t owner ) { Shm_Initialize_lock( lq_cb ); diff --git a/c/src/libchip/shmdr/intr.c b/c/src/libchip/shmdr/intr.c index 9e40b12bbd..76129f7c95 100644 --- a/c/src/libchip/shmdr/intr.c +++ b/c/src/libchip/shmdr/intr.c @@ -26,14 +26,14 @@ #include "shm_driver.h" void Shm_Cause_interrupt( - rtems_unsigned32 node + uint32_t node ) { Shm_Interrupt_information *intr; - rtems_unsigned8 *u8; - rtems_unsigned16 *u16; - rtems_unsigned32 *u32; - rtems_unsigned32 value; + uint8_t *u8; + uint16_t *u16; + uint32_t *u32; + uint32_t value; intr = &Shm_Interrupt_table[node]; value = intr->value; @@ -42,16 +42,16 @@ void Shm_Cause_interrupt( case NO_INTERRUPT: break; case BYTE: - u8 = (rtems_unsigned8 *)intr->address; - *u8 = (rtems_unsigned8) value; + u8 = (uint8_t *)intr->address; + *u8 = (uint8_t ) value; break; case WORD: - u16 = (rtems_unsigned16 *)intr->address; - *u16 = (rtems_unsigned16) value; + u16 = (uint16_t *)intr->address; + *u16 = (uint16_t ) value; break; case LONG: - u32 = (rtems_unsigned32 *)intr->address; - *u32 = (rtems_unsigned32) value; + u32 = (uint32_t *)intr->address; + *u32 = (uint32_t ) value; break; } } diff --git a/c/src/libchip/shmdr/poll.c b/c/src/libchip/shmdr/poll.c index a0ef443698..dca454879d 100644 --- a/c/src/libchip/shmdr/poll.c +++ b/c/src/libchip/shmdr/poll.c @@ -26,7 +26,7 @@ void Shm_Poll() { - rtems_unsigned32 tmpfront; + uint32_t tmpfront; rtems_libio_ioctl_args_t args; /* invoke clock isr */ diff --git a/c/src/libchip/shmdr/send.c b/c/src/libchip/shmdr/send.c index 622689a67e..bdfd272b32 100644 --- a/c/src/libchip/shmdr/send.c +++ b/c/src/libchip/shmdr/send.c @@ -25,16 +25,16 @@ #include "shm_driver.h" struct pkt_cpy { - rtems_unsigned32 packet[MAX_PACKET_SIZE/4]; + uint32_t packet[MAX_PACKET_SIZE/4]; }; rtems_mpci_entry Shm_Send_packet( - rtems_unsigned32 node, + uint32_t node, rtems_packet_prefix *packet ) { Shm_Envelope_control *ecb, *tmp_ecb; - rtems_unsigned32 nnum; + uint32_t nnum; ecb = Shm_Packet_prefix_to_envelope_control_pointer( packet ); if ( node ) { diff --git a/c/src/libchip/shmdr/shm_driver.h b/c/src/libchip/shmdr/shm_driver.h index 4034220c42..eec63a91a9 100644 --- a/c/src/libchip/shmdr/shm_driver.h +++ b/c/src/libchip/shmdr/shm_driver.h @@ -84,7 +84,7 @@ extern "C" { * "tas" instruction which is atomic. All ports to other CPUs * comply with the restrictive placement of lock bit by this * instruction. The lock bit is the most significant bit in a - * big-endian rtems_unsigned32. On other processors, the lock is + * big-endian uint32_t . On other processors, the lock is * typically implemented via an atomic swap or atomic modify * bits type instruction. */ @@ -254,7 +254,7 @@ extern "C" { ((void *)(ecb)->packet) #define Shm_Packet_prefix_to_envelope_control_pointer( pkt ) \ - ((Shm_Envelope_control *)((rtems_unsigned8 *)(pkt) - \ + ((Shm_Envelope_control *)((uint8_t *)(pkt) - \ (sizeof(Shm_Envelope_preamble) + SHM_ENVELOPE_PREFIX_OVERHEAD))) #define Shm_Build_preamble(ecb, node) \ @@ -264,8 +264,8 @@ extern "C" { /* volatile types */ -typedef volatile rtems_unsigned8 vol_u8; -typedef volatile rtems_unsigned32 vol_u32; +typedef volatile uint8_t vol_u8; +typedef volatile uint32_t vol_u32; /* shm control information */ @@ -396,7 +396,7 @@ typedef struct { * base - The base address of the shared memory. This * address may be specific to this node. * length - The length of the shared memory in bytes. - * format - The natural format for rtems_unsigned32's in the + * format - The natural format for uint32_t 's in the * shared memory. Valid values are currently * only SHM_LITTLE and SHM_BIG. * convert - The address of the routine which converts @@ -425,7 +425,7 @@ struct shm_config_info { vol_u32 format; /* SHM is big or little endian */ vol_u32 (*convert)();/* neutral conversion routine */ vol_u32 poll_intr;/* POLLED or INTR driven mode */ - void (*cause_intr)( rtems_unsigned32 ); + void (*cause_intr)( uint32_t ); Shm_Interrupt_information Intr; /* cause intr information */ }; @@ -446,24 +446,24 @@ SHM_EXTERN Shm_Locked_queue_Control *Shm_Locked_queues; SHM_EXTERN Shm_Envelope_control *Shm_Envelopes; SHM_EXTERN rtems_configuration_table *Shm_RTEMS_Configuration; SHM_EXTERN rtems_multiprocessing_table *Shm_RTEMS_MP_Configuration; -SHM_EXTERN rtems_unsigned32 Shm_Receive_message_count; -SHM_EXTERN rtems_unsigned32 Shm_Null_message_count; -SHM_EXTERN rtems_unsigned32 Shm_Interrupt_count; -SHM_EXTERN rtems_unsigned32 Shm_Local_node; +SHM_EXTERN uint32_t Shm_Receive_message_count; +SHM_EXTERN uint32_t Shm_Null_message_count; +SHM_EXTERN uint32_t Shm_Interrupt_count; +SHM_EXTERN uint32_t Shm_Local_node; SHM_EXTERN Shm_Locked_queue_Control *Shm_Local_receive_queue; SHM_EXTERN Shm_Node_status_control *Shm_Local_node_status; -SHM_EXTERN rtems_unsigned32 Shm_isrstat; +SHM_EXTERN uint32_t Shm_isrstat; /* reported by shmdr */ -SHM_EXTERN rtems_unsigned32 Shm_Pending_initialization; -SHM_EXTERN rtems_unsigned32 Shm_Initialization_complete; -SHM_EXTERN rtems_unsigned32 Shm_Active_node; +SHM_EXTERN uint32_t Shm_Pending_initialization; +SHM_EXTERN uint32_t Shm_Initialization_complete; +SHM_EXTERN uint32_t Shm_Active_node; -SHM_EXTERN rtems_unsigned32 Shm_Maximum_nodes; -SHM_EXTERN rtems_unsigned32 Shm_Maximum_envelopes; +SHM_EXTERN uint32_t Shm_Maximum_nodes; +SHM_EXTERN uint32_t Shm_Maximum_envelopes; -SHM_EXTERN rtems_unsigned32 Shm_Locked_queue_End_of_list; -SHM_EXTERN rtems_unsigned32 Shm_Locked_queue_Not_on_list; +SHM_EXTERN uint32_t Shm_Locked_queue_End_of_list; +SHM_EXTERN uint32_t Shm_Locked_queue_Not_on_list; /* functions */ @@ -472,7 +472,7 @@ void Shm_Locked_queue_Add( Shm_Locked_queue_Control *, Shm_Envelope_control * ); Shm_Envelope_control *Shm_Locked_queue_Get( Shm_Locked_queue_Control * ); void Shm_Locked_queue_Initialize( - Shm_Locked_queue_Control *, rtems_unsigned32 ); + Shm_Locked_queue_Control *, uint32_t ); /* Shm_Initialize_lock is CPU dependent */ /* Shm_Lock is CPU dependent */ /* Shm_Unlock is CPU dependent */ @@ -480,8 +480,8 @@ void Shm_Locked_queue_Initialize( /* portable routines */ void Init_env_pool(); void Shm_Print_statistics( void ); -void MPCI_Fatal( Internal_errors_Source, boolean, rtems_unsigned32 ); -rtems_task Shm_Cause_interrupt( rtems_unsigned32 ); +void MPCI_Fatal( Internal_errors_Source, boolean, uint32_t ); +rtems_task Shm_Cause_interrupt( uint32_t ); void Shm_Poll(); void Shm_setclockvec(); void Shm_Convert_packet( rtems_packet_prefix * ); @@ -490,7 +490,7 @@ void Shm_Convert_packet( rtems_packet_prefix * ); /* target specific routines */ void *Shm_Convert_address( void * ); -void Shm_Get_configuration( rtems_unsigned32, shm_config_table ** ); +void Shm_Get_configuration( uint32_t , shm_config_table ** ); void Shm_isr(); void Shm_setvec( void ); @@ -514,7 +514,7 @@ rtems_mpci_entry Shm_Return_packet( ); rtems_mpci_entry Shm_Send_packet( - rtems_unsigned32, + uint32_t , rtems_packet_prefix * ); |