diff options
| author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2008-09-08 09:51:46 +0000 |
|---|---|---|
| committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2008-09-08 09:51:46 +0000 |
| commit | 4a260f074de547dd91bb0dbc25ab52ca4c94eb53 (patch) | |
| tree | 1027df4b08790901aabb2ca7ad40d16dff52497b /c/src/lib/libbsp/powerpc/gen5200/include | |
| parent | 2008-09-08 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-4a260f074de547dd91bb0dbc25ab52ca4c94eb53.tar.bz2 | |
corrected parameters in i2c driver for done signalling
updated mscan CAN driver
Diffstat (limited to 'c/src/lib/libbsp/powerpc/gen5200/include')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/gen5200/include/i2c.h | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h | 21 |
2 files changed, 20 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h b/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h index 06def340ee..8c014c02b6 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h +++ b/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h @@ -67,7 +67,7 @@ typedef struct i2c_message { #define I2C_MSG_ERRSKIP (0x04) /* Skip message if last transfered message is failed */ /* Type for function which is called when transfer over I2C bus is finished */ -typedef void (*i2c_transfer_done) (uint32_t arg); +typedef void (*i2c_transfer_done) (void * arg); /* i2c_initialize -- * I2C driver initialization. This function usually called on device @@ -116,7 +116,7 @@ i2c_select_clock_rate(i2c_bus_number bus, int bps); * 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 @@ -124,7 +124,7 @@ i2c_select_clock_rate(i2c_bus_number bus, int bps); */ 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); /* i2c_transfer_wait -- * Initiate I2C bus transfer and block until this transfer will be diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h b/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h index e7b1bcba7a..e9daefe467 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h +++ b/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h @@ -90,8 +90,14 @@ * @{ */ -#define BTR0_SJW(btr0) ((btr0) << 6) -#define BTR0_BRP(btr0) ((btr0) << 0) +#define BTR0_SJW_MASK 0xc0 +#define BTR0_BRP_MASK 0x3f + +#define BTR0_SJW( btr0) ((btr0) << 6) +#define BTR0_BRP( btr0) ((btr0) << 0) + +#define BTR0_GET_SJW( btr0) (((btr0) & BTR0_SJW_MASK) >> 6) +#define BTR0_GET_BRP( btr0) (((btr0) & BTR0_BRP_MASK) >> 0) /** @} */ @@ -101,9 +107,16 @@ * @{ */ +#define BTR1_SAMP_MASK 0x80 +#define BTR1_TSEG1_MASK 0x0f +#define BTR1_TSEG2_MASK 0x70 + #define BTR1_SAMP (1 << 7) -#define BTR1_TSEG2(btr1) ((btr1) << 4) -#define BTR1_TSEG1(btr1) ((btr1) << 0) +#define BTR1_TSEG1( btr1) ((btr1) << 0) +#define BTR1_TSEG2( btr1) ((btr1) << 4) + +#define BTR1_GET_TSEG1( btr0) (((btr0) & BTR1_TSEG1_MASK) >> 0) +#define BTR1_GET_TSEG2( btr0) (((btr0) & BTR1_TSEG2_MASK) >> 4) /** @} */ |