Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-01 09:27:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* m68040/fpsp/rtems_fpsp.c, mcf5206/clock/ckinit.c,
	mcf5206/console/mcfuart.c, mcf5206/include/mcf5206e.h,
	mcf5206/include/mcfmbus.h, mcf5206/include/mcfuart.h,
	mcf5206/mbus/mcfmbus.c, mcf5206/timer/timer.c: Convert to using c99
	fixed size types.
This commit is contained in:
Ralf Corsepius
2004-03-31 01:59:32 +00:00
parent a4a1ccf66d
commit 8bc4430b7b
9 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
c/src/lib/libcpu/m68k/ChangeLog
+8
View File
@@ -1,3 +1,11 @@
2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org>
* m68040/fpsp/rtems_fpsp.c, mcf5206/clock/ckinit.c,
mcf5206/console/mcfuart.c, mcf5206/include/mcf5206e.h,
mcf5206/include/mcfmbus.h, mcf5206/include/mcfuart.h,
mcf5206/mbus/mcfmbus.c, mcf5206/timer/timer.c: Convert to using c99
fixed size types.
2004-03-26 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure.ac: Add 2nd argument (rtems_updir) to RTEMS_TOP.
c/src/lib/libcpu/m68k/m68040/fpsp/rtems_fpsp.c
+1 -1
View File
@@ -17,7 +17,7 @@ proc_ptr M68040FPSPUserExceptionHandlers[9];
* FPSP exceptions get special treatment.
*/
static int
FPSP_install_raw_handler (unsigned32 vector, proc_ptr new_handler, proc_ptr *old_handler)
FPSP_install_raw_handler (uint32_t vector, proc_ptr new_handler, proc_ptr *old_handler)
{
int fpspVector;
c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c
+2 -2
View File
@@ -30,7 +30,7 @@
* Clock_driver_ticks is a monotonically increasing counter of the
* number of clock ticks since the driver was initialized.
*/
volatile rtems_unsigned32 Clock_driver_ticks;
volatile uint32_t Clock_driver_ticks;
/*
@@ -193,7 +193,7 @@ Clock_control(rtems_device_major_number major,
rtems_device_minor_number minor,
void *pargp)
{
rtems_unsigned32 isrlevel;
uint32_t isrlevel;
rtems_libio_ioctl_args_t *args = pargp;
if (args)
c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c
+11 -11
View File
@@ -51,8 +51,8 @@ mcfuart_interrupt_handler(rtems_vector_number vec);
* RTEMS_SUCCESSFUL if all parameters are valid, or error code
*/
rtems_status_code
mcfuart_init(mcfuart *uart, void *tty, rtems_unsigned8 intvec,
rtems_unsigned32 chn)
mcfuart_init(mcfuart *uart, void *tty, uint8_t intvec,
uint32_t chn)
{
if (uart == NULL)
return RTEMS_INVALID_ADDRESS;
@@ -80,8 +80,8 @@ mcfuart_init(mcfuart *uart, void *tty, rtems_unsigned8 intvec,
static void
mcfuart_set_baudrate(mcfuart *uart, speed_t baud)
{
rtems_unsigned32 div;
rtems_unsigned32 rate;
uint32_t div;
uint32_t rate;
switch (baud)
{
case B50: rate = 50; break;
@@ -110,8 +110,8 @@ mcfuart_set_baudrate(mcfuart *uart, speed_t baud)
div = SYSTEM_CLOCK_FREQUENCY / (rate * 32);
*MCF5206E_UBG1(MBAR,uart->chn) = (rtems_unsigned8)((div >> 8) & 0xff);
*MCF5206E_UBG2(MBAR,uart->chn) = (rtems_unsigned8)(div & 0xff);
*MCF5206E_UBG1(MBAR,uart->chn) = (uint8_t )((div >> 8) & 0xff);
*MCF5206E_UBG2(MBAR,uart->chn) = (uint8_t )(div & 0xff);
}
/*
@@ -134,7 +134,7 @@ mcfuart_set_baudrate(mcfuart *uart, speed_t baud)
rtems_status_code
mcfuart_reset(mcfuart *uart)
{
register rtems_unsigned32 chn;
register uint32_t chn;
rtems_status_code rc;
if (uart == NULL)
@@ -246,7 +246,7 @@ mcfuart_set_attributes(mcfuart *uart, const struct termios *t)
{
int level;
speed_t baud;
rtems_unsigned8 umr1, umr2;
uint8_t umr1, umr2;
baud = cfgetospeed(t);
umr1 = 0;
@@ -349,7 +349,7 @@ mcfuart_set_attributes(mcfuart *uart, const struct termios *t)
int
mcfuart_poll_read(mcfuart *uart)
{
rtems_unsigned8 usr;
uint8_t usr;
int ch;
if (uart->parerr_mark_flag == 1)
{
@@ -419,8 +419,8 @@ static rtems_isr
mcfuart_interrupt_handler(rtems_vector_number vec)
{
mcfuart *uart;
register rtems_unsigned8 usr;
register rtems_unsigned8 uisr;
register uint8_t usr;
register uint8_t uisr;
register int chn;
register int bp = 0;
c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h
+3 -3
View File
@@ -23,11 +23,11 @@
#define MCF5206E_REG32(base,ofs) (ofs+base)
#else
#define MCF5206E_REG8(base,ofs) \
(volatile rtems_unsigned8 *)((rtems_unsigned8 *)(base) + (ofs))
(volatile uint8_t *)((uint8_t *)(base) + (ofs))
#define MCF5206E_REG16(base,ofs) \
(volatile rtems_unsigned16 *)((rtems_unsigned8 *)(base) + (ofs))
(volatile uint16_t *)((uint8_t *)(base) + (ofs))
#define MCF5206E_REG32(base,ofs) \
(volatile rtems_unsigned32 *)((rtems_unsigned8 *)(base) + (ofs))
(volatile uint32_t *)((uint8_t *)(base) + (ofs))
#endif
/*** Instruction Cache -- MCF5206e User's Manual, Chapter 4 ***/
c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h
+4 -4
View File
@@ -28,7 +28,7 @@ typedef enum mcfmbus_i2c_state {
} mcfmbus_i2c_state;
typedef struct mcfmbus {
rtems_unsigned32 base; /* ColdFire internal peripherial base
uint32_t base; /* ColdFire internal peripherial base
address */
enum mcfmbus_i2c_state state;/* State of I2C machine */
i2c_message *msg; /* Pointer to the first message in transfer */
@@ -38,7 +38,7 @@ typedef struct mcfmbus {
rtems_isr_entry oldisr; /* Old interrupt handler */
rtems_id sema; /* MBUS semaphore */
i2c_transfer_done done; /* Transfer done function */
rtems_unsigned32 done_arg; /* Done function argument */
uint32_t done_arg; /* Done function argument */
} mcfmbus;
/* mcfmbus_initialize --
@@ -52,7 +52,7 @@ typedef struct mcfmbus {
* RTEMS_SUCCESSFUL, or RTEMS error code when initialization failed.
*/
rtems_status_code
mcfmbus_initialize(mcfmbus *i2c_bus, rtems_unsigned32 base);
mcfmbus_initialize(mcfmbus *i2c_bus, uint32_t base);
/* mcfmbus_select_clock_divider --
* Select divider for system clock which is used for I2C bus clock
@@ -88,7 +88,7 @@ mcfmbus_select_clock_divider(mcfmbus *i2c_bus, int divider);
*/
rtems_status_code
mcfmbus_i2c_transfer(mcfmbus *bus, int nmsg, i2c_message *msg,
i2c_transfer_done done, rtems_unsigned32 done_arg);
i2c_transfer_done done, uint32_t done_arg);
/* mcfmbus_i2c_done --
* Close ColdFire MBUS I2C bus controller and release all resources.
c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h
+6 -6
View File
@@ -33,14 +33,14 @@
* current operating values
*/
typedef struct mcfuart {
rtems_unsigned32 chn; /* UART channel number */
rtems_unsigned8 intvec; /* UART interrupt vector number, or
uint32_t chn; /* UART channel number */
uint8_t intvec; /* UART interrupt vector number, or
0 if polled I/O */
void *tty; /* termios channel descriptor */
volatile const char *tx_buf; /* Transmit buffer from termios */
volatile rtems_unsigned32 tx_buf_len;/* Transmit buffer length */
volatile rtems_unsigned32 tx_ptr; /* Index of next char to transmit*/
volatile uint32_t tx_buf_len;/* Transmit buffer length */
volatile uint32_t tx_ptr; /* Index of next char to transmit*/
rtems_isr_entry old_handler;/* Saved interrupt handler */
tcflag_t c_iflag; /* termios input mode flags */
@@ -54,8 +54,8 @@ typedef struct mcfuart {
*
*/
rtems_status_code
mcfuart_init(mcfuart *uart, void *tty, rtems_unsigned8 intvec,
rtems_unsigned32 chn);
mcfuart_init(mcfuart *uart, void *tty, uint8_t intvec,
uint32_t chn);
/* mcfuart_reset --
* This function perform the hardware initialization of Motorola
c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c
+6 -6
View File
@@ -112,7 +112,7 @@ static i2c_event
mcfmbus_get_event(mcfmbus *bus)
{
i2c_event event;
rtems_unsigned8 status, control;
uint8_t status, control;
rtems_interrupt_level level;
rtems_interrupt_disable(level);
status = *MCF5206E_MBSR(bus->base);
@@ -172,7 +172,7 @@ mcfmbus_machine_error(mcfmbus *bus, i2c_event event)
static void
mcfmbus_machine(mcfmbus *bus, i2c_event event)
{
rtems_unsigned8 b;
uint8_t b;
switch (bus->state)
{
case STATE_IDLE:
@@ -282,7 +282,7 @@ mcfmbus_machine(mcfmbus *bus, i2c_event event)
{
case EVENT_ACK:
{
rtems_unsigned8 b = (bus->cmsg->addr & 0xff);
uint8_t b = (bus->cmsg->addr & 0xff);
mcfmbus_send(bus, b);
if (bus->state == STATE_ADDR_1_W)
{
@@ -504,7 +504,7 @@ mcfmbus_select_clock_divider(mcfmbus *i2c_bus, int divider)
* RTEMS_SUCCESSFUL, or RTEMS error code when initialization failed.
*/
rtems_status_code
mcfmbus_initialize(mcfmbus *i2c_bus, rtems_unsigned32 base)
mcfmbus_initialize(mcfmbus *i2c_bus, uint32_t base)
{
rtems_interrupt_level level;
rtems_status_code sc;
@@ -561,7 +561,7 @@ mcfmbus_initialize(mcfmbus *i2c_bus, rtems_unsigned32 base)
*/
rtems_status_code
mcfmbus_i2c_transfer(mcfmbus *bus, int nmsg, i2c_message *msg,
i2c_transfer_done done, rtems_unsigned32 done_arg)
i2c_transfer_done done, uint32_t done_arg)
{
if (bus != mbus)
return RTEMS_NOT_CONFIGURED;
@@ -591,7 +591,7 @@ rtems_status_code
mcfmbus_i2c_done(mcfmbus *i2c_bus)
{
rtems_status_code sc;
rtems_unsigned32 base;
uint32_t base;
if (mbus == NULL)
return RTEMS_NOT_CONFIGURED;
c/src/lib/libcpu/m68k/mcf5206/timer/timer.c
+3 -3
View File
@@ -28,7 +28,7 @@
#define TRR2_VAL 65530
rtems_unsigned32 Timer_interrupts;
uint32_t Timer_interrupts;
rtems_boolean Timer_driver_Find_average_overhead;
@@ -105,8 +105,8 @@ Timer_initialize(void)
int
Read_timer( void )
{
rtems_unsigned16 clicks;
rtems_unsigned32 total;
uint16_t clicks;
uint32_t total;
/*
* Read the timer and see how many clicks it has been since counter