Changeset b06d0552 in rtems

Timestamp:

Sep 8, 2008, 9:52:49 AM (11 years ago)

Author:

Thomas Doerfler <Thomas.Doerfler@…>

Branches:

4.10, 4.11, 4.9, master

Children:

95c274e

Parents:

4a260f0

Message:

corrected parameters inside i2c driver for done signalling

Location:

c/src/lib/libbsp/m68k/mcf5206elite

Files:

• ChangeLog (modified) (1 diff)
• i2c/i2c.c (modified) (4 diffs)
• i2c/i2cdrv.c (modified) (7 diffs)
• include/i2c.h (modified) (2 diffs)

c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog

@@ +1 @@
+2008-09-08      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
+
+        * i2c/i2c.c, i2c/i2cdrv.c, include/i2c.h:
+        converted done_arg to a void pointer 
+        
 2008-09-06      Ralf Corsépius <ralf.corsepius@rtems.org>
 

c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c

@@ -24 +24 @@
  */
 static void
-i2c_transfer_sema_done_func(uint32_t         arg)
-{
-    rtems_id sema = (rtems_id)arg;
+i2c_transfer_sema_done_func(void * arg)
+{
+    rtems_id sema = *(rtems_id *)arg;
     rtems_semaphore_release(sema);
 }
@@ -39 +39 @@
  */
 static void
-i2c_transfer_poll_done_func(uint32_t         arg)
+i2c_transfer_poll_done_func(void *arg)
 {
     bool *poll_done_flag = (bool *)arg;
@@ -73 +73 @@
     if (sc != RTEMS_SUCCESSFUL)
         return I2C_RESOURCE_NOT_AVAILABLE;
-    sc = i2c_transfer(bus, nmsg, msg, i2c_transfer_sema_done_func, sema);
+    sc = i2c_transfer(bus, nmsg, msg, 
+                      i2c_transfer_sema_done_func, &sema);
     if (sc != RTEMS_SUCCESSFUL)
     {
@@ -99 +100 @@
 i2c_transfer_wait_poll(i2c_bus_number bus, i2c_message *msg, int nmsg)
 {
+  /*
+   * this looks nasty, but is correct:
+   * we wait in this function, until the poll_done_flag is
+   * set deep inside the i2c_poll() function
+   */
     volatile bool poll_done_flag;
     rtems_status_code sc;
     poll_done_flag = false;
-    sc = i2c_transfer(bus, nmsg, msg, i2c_transfer_poll_done_func,
-                      (uint32_t)&poll_done_flag);
+    sc = i2c_transfer(bus, nmsg, msg, 
+                      i2c_transfer_poll_done_func,(void *)&poll_done_flag);
     if (sc != RTEMS_SUCCESSFUL)
         return sc;

c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c

@@ -50 +50 @@
     int               nmsg;     /* number of messages in transfer */
     i2c_transfer_done done;     /* transfer done callback function */
-    uint32_t          done_arg; /* arbitrary argument to done callback */
+    void *    done_arg_ptr;     /* arbitrary arg pointer to done callback */
 } i2c_qel;
 
@@ -85 +85 @@
  */
 static void
-i2cdrv_done(uint32_t         arg)
+i2cdrv_done(void * arg_ptr)
 {
     rtems_interrupt_level level;
     i2c_qel *qel = tqueue + tqueue_tail;
-    qel->done(qel->done_arg);
+    qel->done(qel->done_arg_ptr);
     rtems_interrupt_disable(level);
     tqueue_tail = (tqueue_tail + 1) % tqueue_size;
@@ -120 +120 @@
             mcfmbus_select_clock_divider(&mbus, i2cdrv_bus_clock_div_current);
         }
-        sc = mcfmbus_i2c_transfer(&mbus, qel->nmsg, qel->msg, i2cdrv_done,
-                                  (uint32_t)qel);
+        sc = mcfmbus_i2c_transfer(&mbus, qel->nmsg, qel->msg, 
+                                  i2cdrv_done,qel);
         if (sc != RTEMS_SUCCESSFUL)
         {
@@ -129 +129 @@
                 qel->msg[i].status = I2C_RESOURCE_NOT_AVAILABLE;
             }
-            i2cdrv_done((uint32_t)qel);
+            i2cdrv_done(qel);
         }
     }
@@ -148 +148 @@
  *     msg - pointer to messages array
  *     done - function which is called when transfer is finished
- *     done_arg - arbitrary argument passed to done funciton
+ *     done_arg_ptr - arbitrary argument pointer passed to done funciton
  *
  * RETURNS:
@@ -156 +156 @@
 rtems_status_code
 i2c_transfer(i2c_bus_number bus, int nmsg, i2c_message *msg,
-             i2c_transfer_done done, uint32_t         done_arg)
+             i2c_transfer_done done, void *     done_arg_ptr)
 {
     i2c_qel qel;
@@ -175 +175 @@
     qel.nmsg = nmsg;
     qel.done = done;
-    qel.done_arg = done_arg;
+    qel.done_arg_ptr = done_arg_ptr;
     rtems_interrupt_disable(level);
     if ((tqueue_head + 1) % tqueue_size == tqueue_tail)

c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h

@@ -117 +117 @@
  *     msg - pointer to messages array
  *     done - function which is called when transfer is finished
- *     done_arg - arbitrary argument passed to done funciton
+ *     done_arg_ptr - arbitrary argument ptr passed to done funciton
  *
  * RETURNS:
@@ -125 +125 @@
 rtems_status_code
 i2c_transfer(i2c_bus_number bus, int nmsg, i2c_message *msg,
-             i2c_transfer_done done, uint32_t         done_arg);
+             i2c_transfer_done done, void * done_arg_ptr);
 
 /* i2c_transfer_wait --