Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>

Browse Source 
* console/console.c, i2c/i2c.c, i2c/i2cdrv.c, include/bsp.h,
	include/i2c.h, nvram/nvram.c, startup/bspstart.c,
	startup/init5206e.c, tod/ds1307.c: Convert to using c99 fixed size
	types.
This commit is contained in:
Ralf Corsepius
2004-03-31 04:40:43 +00:00
parent 6cfc0a4dd2
commit b7044dc94e
10 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
View File

@@ -1,3 +1,10 @@
2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>
* console/console.c, i2c/i2c.c, i2c/i2cdrv.c, include/bsp.h,
include/i2c.h, nvram/nvram.c, startup/bspstart.c,
startup/init5206e.c, tod/ds1307.c: Convert to using c99 fixed size
types.
2004-02-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Reflect changes to bsp.am.

2
c/src/lib/libbsp/m68k/mcf5206elite/console/console.c
View File

@@ -153,7 +153,7 @@ console_first_open(int major, int minor, void *arg)
{
rtems_libio_open_close_args_t *args = arg;
rtems_status_code sc;
rtems_unsigned8 intvec;
uint8_t intvec;
switch (minor)
{

14
c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c
View File

@@ -23,7 +23,7 @@
* arg - done function argument; it is RTEMS semaphore ID.
*/
static void
i2c_transfer_sema_done_func(rtems_unsigned32 arg)
i2c_transfer_sema_done_func(uint32_t arg)
{
rtems_id sema = (rtems_id)arg;
rtems_semaphore_release(sema);
@@ -38,7 +38,7 @@ i2c_transfer_sema_done_func(rtems_unsigned32 arg)
* arg - done function argument; address of poll_done_flag
*/
static void
i2c_transfer_poll_done_func(rtems_unsigned32 arg)
i2c_transfer_poll_done_func(uint32_t arg)
{
rtems_boolean *poll_done_flag = (rtems_boolean *)arg;
*poll_done_flag = 1;
@@ -102,7 +102,7 @@ i2c_transfer_wait_poll(i2c_bus_number bus, i2c_message *msg, int nmsg)
rtems_status_code sc;
poll_done_flag = 0;
sc = i2c_transfer(bus, nmsg, msg, i2c_transfer_poll_done_func,
(rtems_unsigned32)&poll_done_flag);
(uint32_t)&poll_done_flag);
if (sc != RTEMS_SUCCESSFUL)
return sc;
while (poll_done_flag == 0)
@@ -196,10 +196,10 @@ i2c_write(i2c_bus_number bus, i2c_address addr, void *buf, int size)
* transfer status
*/
i2c_message_status
i2c_wrbyte(i2c_bus_number bus, i2c_address addr, rtems_unsigned8 cmd)
i2c_wrbyte(i2c_bus_number bus, i2c_address addr, uint8_t cmd)
{
i2c_message msg;
rtems_unsigned8 data = cmd;
uint8_t data = cmd;
msg.addr = addr;
msg.flags = I2C_MSG_WR;
if (addr > 0xff)
@@ -291,11 +291,11 @@ i2c_wrrd(i2c_bus_number bus, i2c_address addr, void *bufw, int sizew,
* transfer status
*/
i2c_message_status
i2c_wbrd(i2c_bus_number bus, i2c_address addr, rtems_unsigned8 cmd,
i2c_wbrd(i2c_bus_number bus, i2c_address addr, uint8_t cmd,
void *bufr, int sizer)
{
i2c_message msg[2];
rtems_unsigned8 bufw = cmd;
uint8_t bufw = cmd;
msg[0].addr = addr;
msg[0].flags = I2C_MSG_WR | I2C_MSG_ERRSKIP;
if (addr > 0xff)

10
c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c
View File

@@ -49,7 +49,7 @@ typedef struct i2c_qel {
i2c_message *msg; /* pointer to the transfer' messages array */
int nmsg; /* number of messages in transfer */
i2c_transfer_done done; /* transfer done callback function */
rtems_unsigned32 done_arg; /* arbitrary argument to done callback */
uint32_t done_arg; /* arbitrary argument to done callback */
} i2c_qel;
/* Memory for I2C transfer queue. This queue represented like a ring buffer */
@@ -85,7 +85,7 @@ static void i2cdrv_unload(void);
* transfer is finished.
*/
static void
i2cdrv_done(rtems_unsigned32 arg)
i2cdrv_done(uint32_t arg)
{
rtems_interrupt_level level;
i2c_qel *qel = tqueue + tqueue_tail;
@@ -121,7 +121,7 @@ i2cdrv_unload(void)
mcfmbus_select_clock_divider(&mbus, i2cdrv_bus_clock_div_current);
}
sc = mcfmbus_i2c_transfer(&mbus, qel->nmsg, qel->msg, i2cdrv_done,
(rtems_unsigned32)qel);
(uint32_t)qel);
if (sc != RTEMS_SUCCESSFUL)
{
int i;
@@ -129,7 +129,7 @@ i2cdrv_unload(void)
{
qel->msg[i].status = I2C_RESOURCE_NOT_AVAILABLE;
}
i2cdrv_done((rtems_unsigned32)qel);
i2cdrv_done((uint32_t)qel);
}
}
else
@@ -156,7 +156,7 @@ i2cdrv_unload(void)
*/
rtems_status_code
i2c_transfer(i2c_bus_number bus, int nmsg, i2c_message *msg,
i2c_transfer_done done, rtems_unsigned32 done_arg)
i2c_transfer_done done, uint32_t done_arg)
{
i2c_qel qel;
rtems_interrupt_level level;

4
c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
View File

@@ -193,8 +193,8 @@ extern char _SYS_CLOCK_FREQUENCY; /* Don't use this variable directly!!! */
*/
#define delay( microseconds ) \
{ register rtems_unsigned32 _delay=(microseconds); \
register rtems_unsigned32 _tmp=123; \
{ register uint32_t _delay=(microseconds); \
register uint32_t _tmp=123; \
asm volatile( "0: \
nbcd %0 ; \
nbcd %0 ; \

18
c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h
View File

@@ -35,10 +35,10 @@
*/
/* I2C Bus Number type */
typedef rtems_unsigned32 i2c_bus_number;
typedef uint32_t i2c_bus_number;
/* I2C device address */
typedef rtems_unsigned16 i2c_address;
typedef uint16_t i2c_address;
/* I2C error codes generated during message transfer */
typedef enum i2c_message_status {
@@ -54,10 +54,10 @@ typedef enum i2c_message_status {
/* I2C Message */
typedef struct i2c_message {
i2c_address addr; /* I2C slave device address */
rtems_unsigned16 flags; /* message flags (see below) */
uint16_t flags; /* message flags (see below) */
i2c_message_status status; /* message transfer status code */
rtems_unsigned16 len; /* Number of bytes to read or write */
rtems_unsigned8 *buf; /* pointer to data array */
uint16_t len; /* Number of bytes to read or write */
uint8_t *buf; /* pointer to data array */
} i2c_message;
/* I2C message flag */
@@ -67,7 +67,7 @@ typedef struct i2c_message {
#define I2C_MSG_ERRSKIP (0x04) /* Skip message if last transfered message
is failed */
/* Type for function which is called when transfer over I2C bus is finished */
typedef void (*i2c_transfer_done) (rtems_unsigned32 arg);
typedef void (*i2c_transfer_done) (uint32_t arg);
/* i2c_initialize --
* I2C driver initialization. This function usually called on device
@@ -124,7 +124,7 @@ i2c_select_clock_rate(i2c_bus_number bus, int bps);
*/
rtems_status_code
i2c_transfer(i2c_bus_number bus, int nmsg, i2c_message *msg,
i2c_transfer_done done, rtems_unsigned32 done_arg);
i2c_transfer_done done, uint32_t done_arg);
/* i2c_transfer_wait --
* Initiate I2C bus transfer and block until this transfer will be
@@ -187,7 +187,7 @@ i2c_write(i2c_bus_number bus, i2c_address addr, void *buf, int size);
* transfer status
*/
i2c_message_status
i2c_wrbyte(i2c_bus_number bus, i2c_address addr, rtems_unsigned8 cmd);
i2c_wrbyte(i2c_bus_number bus, i2c_address addr, uint8_t cmd);
/* i2c_read --
* receive single message over specified I2C bus from addressed device.
@@ -239,7 +239,7 @@ i2c_wrrd(i2c_bus_number bus, i2c_address addr, void *bufw, int sizew,
* transfer status
*/
i2c_message_status
i2c_wbrd(i2c_bus_number bus, i2c_address addr, rtems_unsigned8 cmd,
i2c_wbrd(i2c_bus_number bus, i2c_address addr, uint8_t cmd,
void *bufr, int sizer);
#endif

6
c/src/lib/libbsp/m68k/mcf5206elite/nvram/nvram.c
View File

@@ -95,7 +95,7 @@ nvram_driver_read(rtems_device_major_number major,
void *arg)
{
rtems_libio_rw_args_t *args = arg;
unsigned32 count;
uint32_t count;
i2c_bus_number bus = DS1307_I2C_BUS_NUMBER;
i2c_address addr = DS1307_I2C_ADDRESS;
i2c_message_status status;
@@ -138,7 +138,7 @@ nvram_driver_write(rtems_device_major_number major,
void *arg)
{
rtems_libio_rw_args_t *args = arg;
unsigned32 count;
uint32_t count;
i2c_bus_number bus = DS1307_I2C_BUS_NUMBER;
i2c_address addr = DS1307_I2C_ADDRESS;
i2c_message_status status;
@@ -159,7 +159,7 @@ nvram_driver_write(rtems_device_major_number major,
{
int try = 0;
do {
rtems_unsigned8 buf[DS1307_NVRAM_SIZE + 1];
uint8_t buf[DS1307_NVRAM_SIZE + 1];
buf[0] = DS1307_NVRAM_START + args->offset;
memcpy(buf+1, args->buffer, count);
status = i2c_write(bus, addr, buf, count+1);

2
c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c
View File

@@ -51,7 +51,7 @@ char *rtems_progname;
*/
void bsp_postdriver_hook(void);
void bsp_libc_init( void *, unsigned32, int );
void bsp_libc_init( void *, uint32_t, int );
void bsp_pretasking_hook(void); /* m68k version */
/* bsp_start --

4
c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c
View File

@@ -202,8 +202,8 @@ Init5206e(void)
{
extern void INTERRUPT_VECTOR();
rtems_unsigned32 *inttab = (rtems_unsigned32 *)&INTERRUPT_VECTOR;
rtems_unsigned32 *intvec = (rtems_unsigned32 *)BSP_MEM_ADDR_ESRAM;
uint32_t *inttab = (uint32_t*)&INTERRUPT_VECTOR;
uint32_t *intvec = (uint32_t*)BSP_MEM_ADDR_ESRAM;
register int i;
for (i = 0; i < 256; i++)
{

10
c/src/lib/libbsp/m68k/mcf5206elite/tod/ds1307.c
View File

@@ -50,7 +50,7 @@ ds1307_initialize(int minor)
{
i2c_message_status status;
int try;
rtems_unsigned8 sec;
uint8_t sec;
i2c_bus_number bus;
i2c_address addr;
@@ -67,7 +67,7 @@ ds1307_initialize(int minor)
/* If clock is halted, reset and start the clock */
if ((sec & DS1307_SECOND_HALT) != 0)
{
rtems_unsigned8 start[8];
uint8_t start[8];
memset(start, 0, sizeof(start));
start[0] = DS1307_SECOND;
try = 0;
@@ -94,8 +94,8 @@ ds1307_get_time(int minor, rtems_time_of_day *time)
{
i2c_bus_number bus;
i2c_address addr;
rtems_unsigned8 info[8];
rtems_unsigned32 v1, v2;
uint8_t info[8];
uint32_t v1, v2;
i2c_message_status status;
int try;
@@ -175,7 +175,7 @@ ds1307_set_time(int minor, rtems_time_of_day *time)
{
i2c_bus_number bus;
i2c_address addr;
rtems_unsigned8 info[8];
uint8_t info[8];
i2c_message_status status;
int try;