change log for rtems (2010-04-25)

rtems-vc at rtems.org rtems-vc at rtems.org
Mon Apr 26 01:10:34 UTC 2010


 *joel*:
2010-04-25	Joel Sherrill <joel.sherrilL at OARcorp.com>

	* libmisc/stringto/stringto_template.h: Remove warning.

M 1.2269  cpukit/ChangeLog
M    1.7  cpukit/libmisc/stringto/stringto_template.h

diff -u rtems/cpukit/ChangeLog:1.2268 rtems/cpukit/ChangeLog:1.2269
--- rtems/cpukit/ChangeLog:1.2268	Sun Apr 25 14:51:11 2010
+++ rtems/cpukit/ChangeLog	Sun Apr 25 19:50:15 2010
@@ -1,3 +1,7 @@
+2010-04-25	Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+	* libmisc/stringto/stringto_template.h: Remove warning.
+
 2010-04-25	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	* posix/src/pthread.c: Make default pthread_attr_t match the

diff -u rtems/cpukit/libmisc/stringto/stringto_template.h:1.6 rtems/cpukit/libmisc/stringto/stringto_template.h:1.7
--- rtems/cpukit/libmisc/stringto/stringto_template.h:1.6	Sun Mar 28 10:20:04 2010
+++ rtems/cpukit/libmisc/stringto/stringto_template.h	Sun Apr 25 19:50:15 2010
@@ -127,7 +127,11 @@
       return RTEMS_INVALID_NUMBER;
   #endif
 
-  *n = (STRING_TO_TYPE) result;
+  #if defined(STRING_TO_POINTER)
+    *n = (STRING_TO_TYPE) (uintptr_t)result;
+  #else
+    *n = (STRING_TO_TYPE) result;
+  #endif
   return RTEMS_SUCCESSFUL;
 }
 


 *joel*:
2010-04-25	Joel Sherrill <joel.sherrilL at OARcorp.com>

	* libchip/serial/mc68681.c, libchip/serial/mc68681_reg.c,
	libchip/serial/ns16550.c, libchip/serial/serial.h,
	libchip/serial/z85c30.c, libchip/serial/z85c30_reg.c: Use uintptr_t
	or intptr_t instead of uint32_t or int32_t.

M  1.510  c/src/ChangeLog
M   1.39  c/src/libchip/serial/mc68681.c
M    1.7  c/src/libchip/serial/mc68681_reg.c
M   1.46  c/src/libchip/serial/ns16550.c
M   1.19  c/src/libchip/serial/serial.h
M   1.31  c/src/libchip/serial/z85c30.c
M    1.8  c/src/libchip/serial/z85c30_reg.c

diff -u rtems/c/src/ChangeLog:1.509 rtems/c/src/ChangeLog:1.510
--- rtems/c/src/ChangeLog:1.509	Sun Apr 25 16:18:05 2010
+++ rtems/c/src/ChangeLog	Sun Apr 25 19:58:39 2010
@@ -1,5 +1,12 @@
 2010-04-25	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
+	* libchip/serial/mc68681.c, libchip/serial/mc68681_reg.c,
+	libchip/serial/ns16550.c, libchip/serial/serial.h,
+	libchip/serial/z85c30.c, libchip/serial/z85c30_reg.c: Use uintptr_t
+	or intptr_t instead of uint32_t or int32_t.
+
+2010-04-25	Joel Sherrill <joel.sherrilL at 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

diff -u rtems/c/src/libchip/serial/mc68681.c:1.38 rtems/c/src/libchip/serial/mc68681.c:1.39
--- rtems/c/src/libchip/serial/mc68681.c:1.38	Fri Apr  9 17:44:05 2010
+++ rtems/c/src/libchip/serial/mc68681.c	Sun Apr 25 19:58:39 2010
@@ -592,7 +592,8 @@
 
   baud_requested = rtems_termios_baud_to_index( baud_requested );
 
-  baud_tbl = (mc68681_baud_table_t *) Console_Port_Tbl[minor].ulClock;
+  baud_tbl = (mc68681_baud_table_t *)
+     ((uintptr_t)Console_Port_Tbl[minor].ulClock);
   if (!baud_tbl)
     rtems_fatal_error_occurred(RTEMS_INVALID_ADDRESS);
 

diff -u rtems/c/src/libchip/serial/mc68681_reg.c:1.6 rtems/c/src/libchip/serial/mc68681_reg.c:1.7
--- rtems/c/src/libchip/serial/mc68681_reg.c:1.6	Tue Apr 20 05:43:39 2004
+++ rtems/c/src/libchip/serial/mc68681_reg.c	Sun Apr 25 19:58:39 2010
@@ -31,7 +31,7 @@
  */
 
 uint8_t   _MC68681_NAME(mc68681_get_register)(
-  uint32_t    ulCtrlPort,
+  uintptr_t   ulCtrlPort,
   uint8_t     ucRegNum
 )
 {
@@ -47,7 +47,7 @@
  */
 
 void  _MC68681_NAME(mc68681_set_register)(
-  uint32_t    ulCtrlPort,
+  uintptr_t   ulCtrlPort,
   uint8_t     ucRegNum,
   uint8_t     ucData
 )

diff -u rtems/c/src/libchip/serial/ns16550.c:1.45 rtems/c/src/libchip/serial/ns16550.c:1.46
--- rtems/c/src/libchip/serial/ns16550.c:1.45	Fri Apr  9 17:44:05 2010
+++ rtems/c/src/libchip/serial/ns16550.c	Sun Apr 25 19:58:39 2010
@@ -95,7 +95,7 @@
 
 NS16550_STATIC void ns16550_init(int minor)
 {
-  uint32_t                pNS16550;
+  uintptr_t               pNS16550;
   uint8_t                 ucTrash;
   uint8_t                 ucDataByte;
   uint32_t                ulBaudDivisor;
@@ -129,7 +129,7 @@
 
   ulBaudDivisor = NS16550_Baud(
     (uint32_t) Console_Port_Tbl[minor].ulClock,
-    (uint32_t) Console_Port_Tbl[minor].pDeviceParams
+    (uint32_t) ((uintptr_t)Console_Port_Tbl[minor].pDeviceParams)
   );
   ucDataByte = SP_LINE_DLAB;
   (*setReg)(pNS16550, NS16550_LINE_CONTROL, ucDataByte);
@@ -183,7 +183,7 @@
   }
 
   /* Set initial baud */
-  rtems_termios_set_initial_baud( tty, (int32_t) c->pDeviceParams);
+  rtems_termios_set_initial_baud( tty, (intptr_t) c->pDeviceParams);
 
   if (c->pDeviceFns->deviceOutputUsesInterrupts) {
     ns16550_enable_interrupts( minor, NS16550_ENABLE_ALL_INTR_EXCEPT_TX);
@@ -217,10 +217,10 @@
 /**
  * @brief Polled write for NS16550.
  */
-NS16550_STATIC void ns16550_write_polled( int minor, char out)
+NS16550_STATIC void ns16550_write_polled(int minor, char out)
 {
   console_tbl *c = &Console_Port_Tbl [minor];
-  uint32_t port = c->ulCtrlPort1;
+  uintptr_t port = c->ulCtrlPort1;
   getRegister_f get = c->getRegister;
   setRegister_f set = c->setRegister;
   uint32_t status = 0;

diff -u rtems/c/src/libchip/serial/serial.h:1.18 rtems/c/src/libchip/serial/serial.h:1.19
--- rtems/c/src/libchip/serial/serial.h:1.18	Fri Apr  9 21:19:02 2010
+++ rtems/c/src/libchip/serial/serial.h	Sun Apr 25 19:58:39 2010
@@ -28,11 +28,10 @@
  *  Types for get and set register routines
  */
 
-typedef uint8_t   (*getRegister_f)(uint32_t   port, uint8_t   register);
-typedef void      (*setRegister_f)(
-                            uint32_t   port, uint8_t   reg, uint8_t   value);
-typedef uint8_t   (*getData_f)(uint32_t   port);
-typedef void      (*setData_f)(uint32_t   port, uint8_t   value);
+typedef uint8_t   (*getRegister_f)(uintptr_t port, uint8_t reg);
+typedef void      (*setRegister_f)(uintptr_t port, uint8_t reg, uint8_t  value);
+typedef uint8_t   (*getData_f)(uintptr_t port);
+typedef void      (*setData_f)(uintptr_t port, uint8_t value);
 
 typedef struct _console_fns {
   bool    (*deviceProbe)(int minor);

diff -u rtems/c/src/libchip/serial/z85c30.c:1.30 rtems/c/src/libchip/serial/z85c30.c:1.31
--- rtems/c/src/libchip/serial/z85c30.c:1.30	Fri Apr  9 17:44:05 2010
+++ rtems/c/src/libchip/serial/z85c30.c	Sun Apr 25 19:58:39 2010
@@ -92,8 +92,8 @@
   int minor
 )
 {
-  uint32_t        ulCtrlPort;
-  uint32_t        ulBaudDivisor;
+  uintptr_t       ulCtrlPort;
+  uintptr_t       ulBaudDivisor;
   setRegister_f   setReg;
 
   ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
@@ -138,7 +138,7 @@
 
   ulBaudDivisor = Z85C30_Baud(
     (uint32_t) Console_Port_Tbl[minor].ulClock,
-    (uint32_t) Console_Port_Tbl[minor].pDeviceParams
+    (uint32_t) ((uintptr_t)Console_Port_Tbl[minor].pDeviceParams)
   );
 
   /*
@@ -253,7 +253,7 @@
 
 Z85C30_STATIC void z85c30_init(int minor)
 {
-  uint32_t         ulCtrlPort;
+  uintptr_t        ulCtrlPort;
   uint8_t          dummy;
   z85c30_context  *pz85c30Context;
   setRegister_f    setReg;
@@ -430,7 +430,7 @@
   const struct termios *t
 )
 {
-  uint32_t               ulCtrlPort;
+  uintptr_t              ulCtrlPort;
   uint32_t               ulBaudDivisor;
   uint32_t               wr3;
   uint32_t               wr4;

diff -u rtems/c/src/libchip/serial/z85c30_reg.c:1.7 rtems/c/src/libchip/serial/z85c30_reg.c:1.8
--- rtems/c/src/libchip/serial/z85c30_reg.c:1.7	Tue Apr 20 05:43:39 2004
+++ rtems/c/src/libchip/serial/z85c30_reg.c	Sun Apr 25 19:58:39 2010
@@ -27,7 +27,7 @@
  */
 
 uint8_t   _Z85C30_NAME(z85c30_get_register)(
-  uint32_t    ulCtrlPort,
+  uintptr_t   ulCtrlPort,
   uint8_t     ucRegNum
 )
 {
@@ -53,7 +53,7 @@
  */
 
 void _Z85C30_NAME(z85c30_set_register)(
-  uint32_t    ulCtrlPort,
+  uintptr_t   ulCtrlPort,
   uint8_t     ucRegNum,
   uint8_t     ucData
 )



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100425/a0528d98/attachment-0001.html>


More information about the vc mailing list