summaryrefslogtreecommitdiffstats
path: root/c/src/libchip/rtc
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-03-23 09:59:52 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-03-23 09:59:52 +0000
commitee4f57d9a6c032da422c6b9b84761dbb30cc2fd8 (patch)
tree06ca24c6757f6f442b80960ca602da9a9e05304a /c/src/libchip/rtc
parent2004-03-23 Ralf Corsepius <ralf_corsepius@rtems.org> (diff)
downloadrtems-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.
Diffstat (limited to 'c/src/libchip/rtc')
-rw-r--r--c/src/libchip/rtc/icm7170.c18
-rw-r--r--c/src/libchip/rtc/icm7170.h48
-rw-r--r--c/src/libchip/rtc/icm7170_reg.c14
-rw-r--r--c/src/libchip/rtc/icm7170_reg2.c2
-rw-r--r--c/src/libchip/rtc/icm7170_reg4.c2
-rw-r--r--c/src/libchip/rtc/icm7170_reg8.c2
-rw-r--r--c/src/libchip/rtc/m48t08.c12
-rw-r--r--c/src/libchip/rtc/m48t08.h48
-rw-r--r--c/src/libchip/rtc/m48t08_reg.c14
-rw-r--r--c/src/libchip/rtc/m48t08_reg2.c2
-rw-r--r--c/src/libchip/rtc/m48t08_reg4.c2
-rw-r--r--c/src/libchip/rtc/m48t08_reg8.c2
-rw-r--r--c/src/libchip/rtc/rtc.h8
13 files changed, 87 insertions, 87 deletions
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;