X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fatm128%2Fsim%2Fatm128_sim.h;h=67201a6a1adf18ff1dce045e79784c20bf5f7bc1;hb=be8a40060769bc7fb6061b291701ce00822de035;hp=7be165a2a8408a52e7e5b2fc289d1bc48d3cec68;hpb=1ba974b83d19fc41bf80acd52726f36f7f1df297;p=tinyos-2.x.git diff --git a/tos/chips/atm128/sim/atm128_sim.h b/tos/chips/atm128/sim/atm128_sim.h index 7be165a2..67201a6a 100644 --- a/tos/chips/atm128/sim/atm128_sim.h +++ b/tos/chips/atm128/sim/atm128_sim.h @@ -13,14 +13,14 @@ //uint8_t atm128RegFile[100][0xa0]; #define _BV(bit) (1 << (bit)) -#define __SFR_OFFSET 0x20 +//#define __SFR_OFFSET 0x20 #define _MMIO_BYTE(mem_addr) (*((volatile uint8_t *)(&atm128RegFile[sim_node()][mem_addr]))) #define _MMIO_WORD(mem_addr) (*((volatile uint16_t *)(&atm128RegFile[sim_node()][mem_addr]))) #define _SFR_MEM8(mem_addr) _MMIO_BYTE(mem_addr) #define _SFR_MEM16(mem_addr) _MMIO_WORD(mem_addr) -#define _SFR_IO8(io_addr) _MMIO_BYTE((io_addr) + 0x20) -#define _SFR_IO16(io_addr) _MMIO_WORD((io_addr) + 0x20) +#define _SFR_IO8(io_addr) _MMIO_BYTE((io_addr) ) +#define _SFR_IO16(io_addr) _MMIO_WORD((io_addr) ) enum { /* Input Pins, Port F */