From 95c274ecf378b06f795af1deb62860ff108475e8 Mon Sep 17 00:00:00 2001 From: Thomas Doerfler Date: Mon, 8 Sep 2008 09:53:40 +0000 Subject: corrected parameters for done signalling --- c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h | 6 +++--- c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'c/src/lib/libcpu') diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h b/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h index a7a9150122..d8a3703151 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h +++ b/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h @@ -38,7 +38,7 @@ typedef struct mcfmbus { rtems_isr_entry oldisr; /* Old interrupt handler */ rtems_id sema; /* MBUS semaphore */ i2c_transfer_done done; /* Transfer done function */ - uint32_t done_arg; /* Done function argument */ + uint32_t done_arg_ptr; /* Done function argument ptr */ } mcfmbus; /* mcfmbus_initialize -- @@ -80,7 +80,7 @@ mcfmbus_select_clock_divider(mcfmbus *i2c_bus, int divider); * nmsg - number of messages * 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: * RTEMS_SUCCESSFUL if transfer initiated successfully, or error @@ -88,7 +88,7 @@ mcfmbus_select_clock_divider(mcfmbus *i2c_bus, int divider); */ rtems_status_code mcfmbus_i2c_transfer(mcfmbus *bus, int nmsg, i2c_message *msg, - i2c_transfer_done done, uint32_t done_arg); + i2c_transfer_done done, void *done_arg_ptr); /* mcfmbus_i2c_done -- * Close ColdFire MBUS I2C bus controller and release all resources. diff --git a/c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c b/c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c index 29e4257fe6..a4bfa72986 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c +++ b/c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c @@ -189,7 +189,7 @@ mcfmbus_machine(mcfmbus *bus, i2c_event event) next_state(bus, STATE_IDLE); bus->msg = bus->cmsg = NULL; bus->nmsg = bus->byte = 0; - bus->done(bus->done_arg); + bus->done(bus->done_arg_ptr); break; } @@ -553,7 +553,7 @@ mcfmbus_initialize(mcfmbus *i2c_bus, uint32_t base) * nmsg - number of messages * 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: * RTEMS_SUCCESSFUL if transfer initiated successfully, or error @@ -561,13 +561,13 @@ mcfmbus_initialize(mcfmbus *i2c_bus, uint32_t base) */ rtems_status_code mcfmbus_i2c_transfer(mcfmbus *bus, int nmsg, i2c_message *msg, - i2c_transfer_done done, uint32_t done_arg) + i2c_transfer_done done, void *done_arg_ptr) { if (bus != mbus) return RTEMS_NOT_CONFIGURED; bus->done = done; - bus->done_arg = done_arg; + bus->done_arg_ptr = done_arg_ptr; bus->cmsg = bus->msg = msg; bus->nmsg = nmsg; bus->byte = 0; -- cgit v1.2.3