Changeset 2b985e79 in rtems


Ignore:
Timestamp:
Sep 21, 2007, 3:48:12 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.9, master
Children:
263d3fc
Parents:
fe5ecbb
Message:

2007-09-21 Daniel Hellstrom <daniel@…>

  • shared/can/occan.c: Fix warning on Diab compiler.
Location:
c/src/lib/libbsp/sparc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/ChangeLog

    rfe5ecbb r2b985e79  
     12007-09-21      Daniel Hellstrom <daniel@gaisler.com>
     2
     3        * shared/can/occan.c: Fix warning on Diab compiler.
     4
    152007-09-19      Daniel Hellstrom <daniel@gaisler.com>
    26
  • c/src/lib/libbsp/sparc/shared/can/occan.c

    rfe5ecbb r2b985e79  
    10031003#ifdef OCCAN_BYTE_REGS
    10041004                        /* regs is byte regs */
    1005                         can->regs = (void *)ambadev.start[0] + OCCAN_NCORE_OFS*subi;
     1005                        can->regs = (void *)(ambadev.start[0] + OCCAN_NCORE_OFS*subi);
    10061006#else
    10071007                        /* regs is word regs, accessed 0x100 from base address */
     
    11821182               
    11831183                /* A bus off interrupt may have occured after checking can->started */
    1184                 if ( can->status & OCCAN_STATUS_ERR_BUSOFF ){
     1184                if ( can->status & (OCCAN_STATUS_ERR_BUSOFF|OCCAN_STATUS_RESET) ){
    11851185                        rtems_interrupt_enable(oldLevel);
    11861186                        DBG("OCCAN: read is cancelled due to a BUS OFF error\n\r");
     
    12111211                       
    12121212                        /* did we get woken up by a BUS OFF error? */
    1213                         if ( can->status & OCCAN_STATUS_ERR_BUSOFF ){
     1213                        if ( can->status & (OCCAN_STATUS_ERR_BUSOFF|OCCAN_STATUS_RESET) ){
    12141214                                DBG("OCCAN: Blocking read got woken up by BUS OFF error\n\r");
    12151215                                /* At this point it should not matter how many messages we handled */
     
    12761276       
    12771277        /* A bus off interrupt may have occured after checking can->started */
    1278         if ( can->status & OCCAN_STATUS_ERR_BUSOFF ){
     1278        if ( can->status & (OCCAN_STATUS_ERR_BUSOFF|OCCAN_STATUS_RESET) ){
    12791279                rtems_interrupt_enable(oldLevel);
    12801280                rw_args->bytes_moved = 0;
     
    13311331                       
    13321332                        /* did we get woken up by a BUS OFF error? */
    1333                         if ( can->status & OCCAN_STATUS_ERR_BUSOFF ){
    1334                                 DBG("OCCAN: Blocking write got woken up by BUS OFF error\n\r");
     1333                        if ( can->status & (OCCAN_STATUS_ERR_BUSOFF|OCCAN_STATUS_RESET) ){
     1334                                DBG("OCCAN: Blocking write got woken up by BUS OFF error or RESET event\n\r");
    13351335                                /* At this point it should not matter how many messages we handled */
    13361336                                rw_args->bytes_moved = rw_args->count-left;
Note: See TracChangeset for help on using the changeset viewer.