Author: ros-arm-bringup
Date: Sun Jul 12 14:41:50 2009
New Revision: 41918
URL:
http://svn.reactos.org/svn/reactos?rev=41918&view=rev
Log:
Define the base addresses as ULONG_PTR since pointer math on void* is illegal
Modified:
trunk/reactos/include/reactos/arm/peripherals/pl011.h
trunk/reactos/include/reactos/arm/peripherals/pl190.h
trunk/reactos/include/reactos/arm/peripherals/sp804.h
Modified: trunk/reactos/include/reactos/arm/peripherals/pl011.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph…
==============================================================================
--- trunk/reactos/include/reactos/arm/peripherals/pl011.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/arm/peripherals/pl011.h [iso-8859-1] Sun Jul 12 14:41:50
2009
@@ -11,7 +11,7 @@
//
// UART Registers
//
-#define UART_BASE (PVOID)0xE00F1000 /* HACK: freeldr mapped it here */
+#define UART_BASE (ULONG_PTR)0xE00F1000 /* HACK: freeldr mapped it here
*/
#define UART_PL01x_DR (UART_BASE + 0x00)
#define UART_PL01x_RSR (UART_BASE + 0x04)
Modified: trunk/reactos/include/reactos/arm/peripherals/pl190.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph…
==============================================================================
--- trunk/reactos/include/reactos/arm/peripherals/pl190.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/arm/peripherals/pl190.h [iso-8859-1] Sun Jul 12 14:41:50
2009
@@ -11,7 +11,7 @@
//
// VIC Registers
//
-#define VIC_BASE (PVOID)0xE0040000 /* HACK: freeldr mapped it here */
+#define VIC_BASE (ULONG_PTR)0xE0040000 /* HACK: freeldr mapped it here */
#define VIC_INT_STATUS (VIC_BASE + 0x00)
#define VIC_INT_ENABLE (VIC_BASE + 0x10)
Modified: trunk/reactos/include/reactos/arm/peripherals/sp804.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph…
==============================================================================
--- trunk/reactos/include/reactos/arm/peripherals/sp804.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/arm/peripherals/sp804.h [iso-8859-1] Sun Jul 12 14:41:50
2009
@@ -11,7 +11,7 @@
//
// Timer Registers
//
-#define TIMER_BASE(x) (PVOID)(0xE00E2000 + (x * 0x1000)) /* HACK: freeldr
mapped it here */
+#define TIMER_BASE(x) (ULONG_PTR)(0xE00E2000 + (x * 0x1000)) /* HACK: freeldr
mapped it here */
#define TIMER0_LOAD TIMER_BASE(0) + 0x00
#define TIMER0_VALUE TIMER_BASE(0) + 0x04
#define TIMER0_CONTROL TIMER_BASE(0) + 0x08