From 5280c7cda766ba100065de82407e8414d13e8e9f Mon Sep 17 00:00:00 2001 From: Christian Starkjohann Date: Wed, 18 Jun 2008 14:05:26 +0000 Subject: - extended concept of usbportability header: moved all portability stuff there --- usbdrv/usbdrv.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'usbdrv/usbdrv.c') diff --git a/usbdrv/usbdrv.c b/usbdrv/usbdrv.c index 0168a44..4917078 100644 --- a/usbdrv/usbdrv.c +++ b/usbdrv/usbdrv.c @@ -55,7 +55,7 @@ static uchar usbMsgFlags; /* flag values see below */ /* optimizing hints: - do not post/pre inc/dec integer values in operations -- assign value of PRG_RDB() to register variables and don't use side effects in arg +- assign value of USB_READ_FLASH() to register variables and don't use side effects in arg - use narrow scope for variables which should be in X/Y/Z register - assign char sized expressions to variables to force 8 bit arithmetics */ @@ -194,15 +194,6 @@ PROGMEM char usbDescriptorConfiguration[] = { /* USB configuration descriptor /* ------------------------------------------------------------------------- */ -/* We don't use prog_int or prog_int16_t for compatibility with various libc - * versions. Here's an other compatibility hack: - */ -#ifndef PRG_RDB -#define PRG_RDB(addr) pgm_read_byte(addr) -#endif - -/* ------------------------------------------------------------------------- */ - static inline void usbResetDataToggling(void) { #if USB_CFG_HAVE_INTRIN_ENDPOINT @@ -504,7 +495,7 @@ static uchar usbDeviceRead(uchar *data, uchar len) uchar i = len, *r = usbMsgPtr; if(usbMsgFlags & USB_FLG_MSGPTR_IS_ROM){ /* ROM data */ do{ - uchar c = PRG_RDB(r); /* assign to char size variable to enforce byte ops */ + uchar c = USB_READ_FLASH(r); /* assign to char size variable to enforce byte ops */ *data++ = c; r++; }while(--i); -- cgit v1.2.3