RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2007-09-21 Daniel Hellstrom <daniel@gaisler.com>

Browse Source 
* shared/can/occan.c: Fix warning on Diab compiler.
This commit is contained in:
Joel Sherrill
2007-09-21 15:47:53 +00:00
parent b9f17f8a41
commit c2ac7e9df5
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/sparc/ChangeLog
View File

@@ -1,3 +1,7 @@
2007-09-21 Daniel Hellstrom <daniel@gaisler.com>
* shared/can/occan.c: Fix warning on Diab compiler.
2007-09-19 Daniel Hellstrom <daniel@gaisler.com> 2007-09-19 Daniel Hellstrom <daniel@gaisler.com>
* shared/can/occan.c: Fix Reenable command and fix typo. * shared/can/occan.c: Fix Reenable command and fix typo.

12
c/src/lib/libbsp/sparc/shared/can/occan.c
View File

@@ -1002,7 +1002,7 @@ static rtems_device_driver occan_initialize(rtems_device_major_number major, rte
#ifdef OCCAN_BYTE_REGS #ifdef OCCAN_BYTE_REGS
/* regs is byte regs */ /* regs is byte regs */
can->regs = (void *)ambadev.start[0] + OCCAN_NCORE_OFS*subi; can->regs = (void *)(ambadev.start[0] + OCCAN_NCORE_OFS*subi);
#else #else
/* regs is word regs, accessed 0x100 from base address */ /* regs is word regs, accessed 0x100 from base address */
can->regs = (void *)(ambadev.start[0] + OCCAN_NCORE_OFS*subi+ OCCAN_WORD_REG_OFS); can->regs = (void *)(ambadev.start[0] + OCCAN_NCORE_OFS*subi+ OCCAN_WORD_REG_OFS);
@@ -1181,7 +1181,7 @@ static rtems_device_driver occan_read(rtems_device_major_number major, rtems_dev
rtems_interrupt_disable(oldLevel); rtems_interrupt_disable(oldLevel);
/* A bus off interrupt may have occured after checking can->started */ /* A bus off interrupt may have occured after checking can->started */
if ( can->status & OCCAN_STATUS_ERR_BUSOFF ){ if ( can->status & (OCCAN_STATUS_ERR_BUSOFF|OCCAN_STATUS_RESET) ){
rtems_interrupt_enable(oldLevel); rtems_interrupt_enable(oldLevel);
DBG("OCCAN: read is cancelled due to a BUS OFF error\n\r"); DBG("OCCAN: read is cancelled due to a BUS OFF error\n\r");
rw_args->bytes_moved = rw_args->count-left; rw_args->bytes_moved = rw_args->count-left;
@@ -1210,7 +1210,7 @@ static rtems_device_driver occan_read(rtems_device_major_number major, rtems_dev
rtems_semaphore_obtain(can->rxsem,RTEMS_WAIT,RTEMS_NO_TIMEOUT); rtems_semaphore_obtain(can->rxsem,RTEMS_WAIT,RTEMS_NO_TIMEOUT);
/* did we get woken up by a BUS OFF error? */ /* did we get woken up by a BUS OFF error? */
if ( can->status & OCCAN_STATUS_ERR_BUSOFF ){ if ( can->status & (OCCAN_STATUS_ERR_BUSOFF|OCCAN_STATUS_RESET) ){
DBG("OCCAN: Blocking read got woken up by BUS OFF error\n\r"); DBG("OCCAN: Blocking read got woken up by BUS OFF error\n\r");
/* At this point it should not matter how many messages we handled */ /* At this point it should not matter how many messages we handled */
rw_args->bytes_moved = rw_args->count-left; rw_args->bytes_moved = rw_args->count-left;
@@ -1275,7 +1275,7 @@ static rtems_device_driver occan_write(rtems_device_major_number major, rtems_de
rtems_interrupt_disable(oldLevel); rtems_interrupt_disable(oldLevel);
/* A bus off interrupt may have occured after checking can->started */ /* A bus off interrupt may have occured after checking can->started */
if ( can->status & OCCAN_STATUS_ERR_BUSOFF ){ if ( can->status & (OCCAN_STATUS_ERR_BUSOFF|OCCAN_STATUS_RESET) ){
rtems_interrupt_enable(oldLevel); rtems_interrupt_enable(oldLevel);
rw_args->bytes_moved = 0; rw_args->bytes_moved = 0;
return RTEMS_IO_ERROR; /* EIO */ return RTEMS_IO_ERROR; /* EIO */
@@ -1330,8 +1330,8 @@ static rtems_device_driver occan_write(rtems_device_major_number major, rtems_de
rtems_semaphore_obtain(can->txsem, RTEMS_WAIT, RTEMS_NO_TIMEOUT); rtems_semaphore_obtain(can->txsem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
/* did we get woken up by a BUS OFF error? */ /* did we get woken up by a BUS OFF error? */
if ( can->status & OCCAN_STATUS_ERR_BUSOFF ){ if ( can->status & (OCCAN_STATUS_ERR_BUSOFF|OCCAN_STATUS_RESET) ){
DBG("OCCAN: Blocking write got woken up by BUS OFF error\n\r"); DBG("OCCAN: Blocking write got woken up by BUS OFF error or RESET event\n\r");
/* At this point it should not matter how many messages we handled */ /* At this point it should not matter how many messages we handled */
rw_args->bytes_moved = rw_args->count-left; rw_args->bytes_moved = rw_args->count-left;
return RTEMS_IO_ERROR; /* EIO */ return RTEMS_IO_ERROR; /* EIO */