- extended concept of usbportability header: moved all portability stuff there

1 files changed, 39 insertions, 5 deletions

diff --git a/usbdrv/usbportability.h b/usbdrv/usbportability.h
index e2db604..43d9a48 100644
--- a/usbdrv/usbportability.h
+++ b/usbdrv/usbportability.h
@@ -26,7 +26,9 @@ Thanks to Oleg Semyonov for his help with the IAR tools port!
 
 /* We check explicitly for IAR and CodeVision. Default is avr-gcc/avr-libc. */
 
+/* ------------------------------------------------------------------------- */
 #if defined __IAR_SYSTEMS_ICC__ || defined __IAR_SYSTEMS_ASM__  /* check for IAR */
+/* ------------------------------------------------------------------------- */
 
 #ifndef ENABLE_BIT_DEFINITIONS
 #   define ENABLE_BIT_DEFINITIONS	1   /* Enable bit definitions */
@@ -50,7 +52,7 @@ Thanks to Oleg Semyonov for his help with the IAR tools port!
 #   define PROGMEM __flash
 #endif
 
-#define PRG_RDB(addr)   (*(PROGMEM char *)(addr))
+#define USB_READ_FLASH(addr)    (*(PROGMEM char *)(addr))
 
 /* The following definitions are not needed by the driver, but may be of some
  * help if you port a gcc based project to IAR.
@@ -60,6 +62,17 @@ Thanks to Oleg Semyonov for his help with the IAR tools port!
 #define wdt_reset() __watchdog_reset()
 #define _BV(x)      (1 << (x))
 
+/* assembler compatibility macros */
+#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 */
+
 /* Depending on the device you use, you may get problems with the way usbdrv.h
  * handles the differences between devices. Since IAR does not use #defines
  * for MCU registers, we can't check for the existence of a particular
@@ -68,17 +81,20 @@ Thanks to Oleg Semyonov for his help with the IAR tools port!
  * usbconfig-prototype.h and usbdrv.h for details.
  */
 
+/* ------------------------------------------------------------------------- */
 #elif __CODEVISIONAVR__ /* check for CodeVision AVR */
+/* ------------------------------------------------------------------------- */
+/* This port is not working (yet) */
 
-#define F_CPU   _MCU_CLOCK_FREQUENCY_
+/* #define F_CPU   _MCU_CLOCK_FREQUENCY_    seems to be defined automatically */
 
 #include <io.h>
 #include <delay.h>
 
 #define __attribute__(arg)  /* not supported on IAR */
 
-#define PROGMEM         __flash
-#define PRG_RDB(addr)   (*(PROGMEM char *)(addr))
+#define PROGMEM                 __flash
+#define USB_READ_FLASH(addr)    (*(PROGMEM char *)(addr))
 
 #ifndef __ASSEMBLER__
 static inline void  cli(void)
@@ -91,9 +107,16 @@ static inline void  sei(void)
 }
 #endif
 #define _delay_ms(t)    delay_ms(t)
-#define _BV(x)      (1 << (x))
+#define _BV(x)          (1 << (x))
+#define USB_CFG_USE_SWITCH_STATEMENT 1  /* macro for if() cascase fails for unknown reason */
 
+#define macro   .macro
+#define endm    .endmacro
+#define nop2    rjmp    .+0 /* jump to next instruction */
+
+/* ------------------------------------------------------------------------- */
 #else   /* default development environment is avr-gcc/avr-libc */
+/* ------------------------------------------------------------------------- */
 
 #include <avr/io.h>
 #ifdef __ASSEMBLER__
@@ -102,5 +125,16 @@ static inline void  sei(void)
 #   include <avr/pgmspace.h>
 #endif
 
+#define USB_READ_FLASH(addr)    pgm_read_byte(addr)
+
+#define macro   .macro
+#define endm    .endm
+#define nop2    rjmp    .+0 /* jump to next instruction */
+
 #endif  /* development environment */
+
+/* for conveniecne, ensure that PRG_RDB exists */
+#ifndef PRG_RDB
+#   define PRG_RDB(addr)    USB_READ_FLASH(addr)
+#endif
 #endif  /* __usbportability_h_INCLUDED__ */