diff options
| author | Christian Starkjohann <cs+github@obdev.at> | 2008-06-18 14:05:26 +0000 |
|---|---|---|
| committer | Christian Starkjohann <cs+github@obdev.at> | 2008-06-18 14:05:26 +0000 |
| commit | 5280c7cda766ba100065de82407e8414d13e8e9f (patch) | |
| tree | d7c49d97771059007e130f8d7d0f1f39bc1e982f /usbdrv/usbdrvasm.S | |
| parent | 4f0353ba8355196550a842576f8f5af47392f4a7 (diff) | |
| download | v-usb-5280c7cda766ba100065de82407e8414d13e8e9f.tar.gz v-usb-5280c7cda766ba100065de82407e8414d13e8e9f.tar.bz2 v-usb-5280c7cda766ba100065de82407e8414d13e8e9f.zip | |
- extended concept of usbportability header: moved all portability stuff there
Diffstat (limited to 'usbdrv/usbdrvasm.S')
| -rw-r--r-- | usbdrv/usbdrvasm.S | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/usbdrv/usbdrvasm.S b/usbdrv/usbdrvasm.S index 119b738..cdaa796 100644 --- a/usbdrv/usbdrvasm.S +++ b/usbdrv/usbdrvasm.S @@ -17,11 +17,7 @@ the file appropriate for the given clock rate. #define __SFR_OFFSET 0 /* used by avr-libc's register definitions */ #include "usbportability.h" -#ifndef __IAR_SYSTEMS_ASM__ -# define macro .macro /* GNU Assembler macro definition */ -# define endm .endm /* End of GNU Assembler macro definition */ -#endif /* __IAR_SYSTEMS_ASM__ */ -#include "usbdrv.h" /* for common defs */ +#include "usbdrv.h" /* for common defs */ /* register names */ #define x1 r16 @@ -37,17 +33,6 @@ the file appropriate for the given clock rate. /* Some assembler dependent definitions and declarations: */ #ifdef __IAR_SYSTEMS_ASM__ - -# define nop2 rjmp $+2 /* jump to next instruction */ -# define XL r26 -# define XH r27 -# define YL r28 -# define YH r29 -# define ZL r30 -# define ZH r31 -# define lo8(x) LOW(x) -# define hi8(x) (((x)>>8) & 0xff) /* not HIGH to allow XLINK to make a proper range check */ - extern usbRxBuf, usbDeviceAddr, usbNewDeviceAddr, usbInputBufOffset extern usbCurrentTok, usbRxLen, usbRxToken, usbTxLen extern usbTxBuf, usbTxStatus1, usbTxStatus3 @@ -70,8 +55,6 @@ the file appropriate for the given clock rate. #else /* __IAR_SYSTEMS_ASM__ */ -# define nop2 rjmp .+0 /* jump to next instruction */ - # ifndef USB_INTR_VECTOR /* default to hardware interrupt INT0 */ # define USB_INTR_VECTOR SIG_INTERRUPT0 # endif |