Changeset 8593651 in rtems


Ignore:
Timestamp:
May 31, 2010, 12:21:43 PM (9 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, master
Children:
2d76aa8
Parents:
bfa3a3e
Message:

2010-05-31 Ralf Corsépius <ralf.corsepius@…>

  • libchip/network/cs8900.c: Misc. changes to make code 16bit-target compliant.
Location:
c/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/ChangeLog

    rbfa3a3e r8593651  
    112010-05-31      Ralf Corsépius <ralf.corsepius@rtems.org>
    22
     3        * libchip/network/cs8900.c:
     4        Misc. changes to make code 16bit-target compliant.
    35        * libchip/network/i82586.c:
    46        Use int32_t instead of int for 16bit-target compliance.
  • c/src/libchip/network/cs8900.c

    rbfa3a3e r8593651  
    6666}
    6767
    68 static inline unsigned long
    69 io_pp_get_reg_32 (cs8900_device *cs, unsigned short reg)
     68static inline uint32_t
     69io_pp_get_reg_32 (cs8900_device *cs, uint16_t reg)
    7070{
    7171  rtems_interrupt_level level;
    72   unsigned long        data;
     72  uint32_t data;
    7373  rtems_interrupt_disable (level);
    7474  cs8900_io_set_reg (cs, CS8900_IO_PACKET_PAGE_PTR,
    7575                     0x3000 | CS8900_PPP_AUTO_INCREMENT | reg);
    76   data =  ((cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT0) << 16) |
    77            cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT1));
     76  data = cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT0);
     77  data <<= 16;
     78  data |= cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT1);
    7879  rtems_interrupt_enable (level);
    7980  return data;
Note: See TracChangeset for help on using the changeset viewer.