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

2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>

Browse Source 
* libchip/rtc/ds1375-rtc.h, libchip/rtc/ds1375.c,
	libchip/rtc/icm7170.c, libchip/rtc/icm7170_reg.c,
	libchip/rtc/m48t08_reg.c, libchip/rtc/rtc.h: Use uintptr_t instead of
	uint32_t.
This commit is contained in:
Joel Sherrill
2010-04-25 21:18:06 +00:00
parent 18b3b58110
commit 2b0d72afb8
7 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
c/src/ChangeLog
+7
View File
@@ -1,3 +1,10 @@
2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
* libchip/rtc/ds1375-rtc.h, libchip/rtc/ds1375.c,
libchip/rtc/icm7170.c, libchip/rtc/icm7170_reg.c,
libchip/rtc/m48t08_reg.c, libchip/rtc/rtc.h: Use uintptr_t instead of
uint32_t.
2010-04-10 Ralf Corsépius <ralf.corsepius@rtems.org>
* libchip/serial/serial.h: Add extern "C".
c/src/libchip/rtc/ds1375-rtc.h
+6 -6
View File
@@ -64,10 +64,10 @@ bool
rtc_ds1375_device_probe( int minor );
uint32_t
rtc_ds1375_get_register( uint32_t port, uint8_t reg );
rtc_ds1375_get_register( uintptr_t port, uint8_t reg );
void
rtc_ds1375_set_register( uint32_t port, uint8_t reg, uint32_t value );
rtc_ds1375_set_register( uintptr_t port, uint8_t reg, uint32_t value );
/*
* BSP must supply string constant argument 'i2cname' which matches
@@ -84,11 +84,11 @@ rtc_ds1375_set_register( uint32_t port, uint8_t reg, uint32_t value );
#define DS1375_RTC_TBL_ENTRY(i2cname) \
{ \
sDeviceName: "/dev/rtc", \
deviceType: RTC_CUSTOM, \
pDeviceFns: &rtc_ds1375_fns, \
deviceType: RTC_CUSTOM, \
pDeviceFns: &rtc_ds1375_fns, \
deviceProbe: rtc_ds1375_device_probe, \
ulCtrlPort1: (uint32_t)(i2cname), \
ulDataPort: 0, \
ulCtrlPort1: (uintptr_t)(i2cname), \
ulDataPort: 0, \
getRegister: rtc_ds1375_get_register, \
setRegister: rtc_ds1375_set_register, \
}
c/src/libchip/rtc/ds1375.c
+3 -3
View File
@@ -397,7 +397,7 @@ rtems_time_of_day rt;
uint32_t
rtc_ds1375_get_register( uint32_t port, uint8_t reg )
rtc_ds1375_get_register( uintptr_t port, uint8_t reg )
{
int fd;
uint8_t v;
@@ -415,7 +415,7 @@ uint32_t rval = -1;
}
void
rtc_ds1375_set_register( uint32_t port, uint8_t reg, uint32_t value )
rtc_ds1375_set_register( uintptr_t port, uint8_t reg, uint32_t value )
{
int fd;
uint8_t v = value;
@@ -454,7 +454,7 @@ bool rtc_ds1375_device_probe(
}
rtc_fns rtc_ds1375_fns = {
deviceInitialize: ds1375_initialize,
deviceInitialize: ds1375_initialize,
deviceGetTime: ds1375_get_time,
deviceSetTime: ds1375_set_time,
};
c/src/libchip/rtc/icm7170.c
+6 -6
View File
@@ -41,9 +41,9 @@ static void icm7170_initialize(
int minor
)
{
uint32_t icm7170;
uintptr_t icm7170;
setRegister_f setReg;
uint32_t clock;
uintptr_t clock;
icm7170 = RTC_Table[ minor ].ulCtrlPort1;
setReg = RTC_Table[ minor ].setRegister;
@@ -52,7 +52,7 @@ static void icm7170_initialize(
* Initialize the RTC with the proper clock frequency
*/
clock = (uint32_t) RTC_Table[ minor ].pDeviceParams;
clock = (uintptr_t) RTC_Table[ minor ].pDeviceParams;
(*setReg)( icm7170, ICM7170_CONTROL, 0x0c | clock );
}
@@ -118,16 +118,16 @@ static int icm7170_set_time(
const rtems_time_of_day *time
)
{
uint32_t icm7170;
uintptr_t icm7170;
getRegister_f getReg;
setRegister_f setReg;
uint32_t year;
uint32_t clock;
uintptr_t clock;
icm7170 = RTC_Table[ minor ].ulCtrlPort1;
getReg = RTC_Table[ minor ].getRegister;
setReg = RTC_Table[ minor ].setRegister;
clock = (uint32_t) RTC_Table[ minor ].pDeviceParams;
clock = (uintptr_t) RTC_Table[ minor ].pDeviceParams;
year = time->year;
c/src/libchip/rtc/icm7170_reg.c
+2 -2
View File
@@ -31,7 +31,7 @@
*/
uint32_t _ICM7170_NAME(icm7170_get_register)(
uint32_t ulCtrlPort,
uintptr_t ulCtrlPort,
uint8_t ucRegNum
)
{
@@ -47,7 +47,7 @@ uint32_t _ICM7170_NAME(icm7170_get_register)(
*/
void _ICM7170_NAME(icm7170_set_register)(
uint32_t ulCtrlPort,
uintptr_t ulCtrlPort,
uint8_t ucRegNum,
uint32_t ucData
)
c/src/libchip/rtc/m48t08_reg.c
+2 -2
View File
@@ -31,7 +31,7 @@
*/
uint32_t _M48T08_NAME(m48t08_get_register)(
uint32_t ulCtrlPort,
uintptr_t ulCtrlPort,
uint8_t ucRegNum
)
{
@@ -47,7 +47,7 @@ uint32_t _M48T08_NAME(m48t08_get_register)(
*/
void _M48T08_NAME(m48t08_set_register)(
uint32_t ulCtrlPort,
uintptr_t ulCtrlPort,
uint8_t ucRegNum,
uint32_t ucData
)
c/src/libchip/rtc/rtc.h
+4 -5
View File
@@ -24,9 +24,8 @@
* Types for get and set register routines
*/
typedef uint32_t (*getRegister_f)(uint32_t port, uint8_t register);
typedef void (*setRegister_f)(
uint32_t port, uint8_t reg, uint32_t value);
typedef uint32_t (*getRegister_f)(uintptr_t port, uint8_t reg);
typedef void (*setRegister_f)(uintptr_t port, uint8_t reg, uint32_t value);
typedef struct _rtc_fns {
void (*deviceInitialize)(int minor);
@@ -68,8 +67,8 @@ typedef struct _rtc_tbl {
const rtc_fns *pDeviceFns;
bool (*deviceProbe)(int minor);
void *pDeviceParams;
uint32_t ulCtrlPort1;
uint32_t ulDataPort;
uintptr_t ulCtrlPort1;
uintptr_t ulDataPort;
getRegister_f getRegister;
setRegister_f setRegister;
} rtc_tbl;