2004-04-28 Theodore A. Roth * include/avr/eeprom.h (eeprom_rb): Remove deprecated interface. (eeprom_rw): Ditto. (eeprom_wb): Ditto. (_EEPUT): Use eeprom_write_byte() directly instead of eeprom_wb(). (_EEGET): Use eeprom_read_byte() directly instead of eeprom_rb(). * include/avr/pgmspace.h (PRG_RDB): Remove deprecated interface. * include/avr/sfr_defs.h (cbi): Ditto. (sbi): Ditto. (inb): Ditto. (outb): Ditto. (inw): Ditto. (outw): Ditto. (outp): Ditto. (inp): Ditto. (BV): Ditto. Index: include/avr/eeprom.h =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/include/avr/eeprom.h,v retrieving revision 1.9 diff -u -p -p -r1.9 eeprom.h --- include/avr/eeprom.h 26 Feb 2004 00:27:25 -0000 1.9 +++ include/avr/eeprom.h 28 Apr 2004 16:08:08 -0000 @@ -124,33 +124,6 @@ extern void eeprom_write_block (const vo /address@hidden/ -/** \name Backwards compatibility defines */ - -/address@hidden/ - -/** \def eeprom_rb - \ingroup avr_eeprom - \deprecated - Use eeprom_read_byte() in new programs. */ - -#define eeprom_rb(addr) eeprom_read_byte ((uint8_t *)(addr)) - -/** \def eeprom_rw - \ingroup avr_eeprom - \deprecated - Use eeprom_read_word() in new programs. */ - -#define eeprom_rw(addr) eeprom_read_word ((uint16_t *)(addr)) - -/** \def eeprom_wb - \ingroup avr_eeprom - \deprecated - Use eeprom_write_byte() in new programs. */ - -#define eeprom_wb(addr,val) eeprom_write_byte ((uint8_t *)(addr), (uint8_t)(val)) - -/address@hidden/ - /** \name IAR C compatibility defines */ /address@hidden/ @@ -159,13 +132,13 @@ extern void eeprom_write_block (const vo \ingroup avr_eeprom Write a byte to EEPROM. */ -#define _EEPUT(addr, val) eeprom_wb(addr, val) +#define _EEPUT(addr, val) eeprom_write_byte ((uint8_t *)(addr), (uint8_t)(val)) /** \def _EEGET \ingroup avr_eeprom Read a byte from EEPROM. */ -#define _EEGET(var, addr) (var) = eeprom_rb(addr) +#define _EEGET(var, addr) (var) = eeprom_read_byte ((uint8_t *)(addr)) /address@hidden/ Index: include/avr/pgmspace.h =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/include/avr/pgmspace.h,v retrieving revision 1.19 diff -u -p -p -r1.19 pgmspace.h --- include/avr/pgmspace.h 16 Apr 2004 17:17:47 -0000 1.19 +++ include/avr/pgmspace.h 28 Apr 2004 16:08:08 -0000 @@ -501,17 +501,4 @@ extern PGM_P strerror_P(int); } #endif -/** \name Backwards compatibility macros */ - -/address@hidden/ - -/** \ingroup avr_pgmspace - \def PRG_RDB - \deprecated - Use pgm_read_byte() in new programs. */ - -#define PRG_RDB(addr) pgm_read_byte(addr) - -/address@hidden/ - #endif /* __PGMSPACE_H_ */ Index: include/avr/sfr_defs.h =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/include/avr/sfr_defs.h,v retrieving revision 1.12 diff -u -p -p -r1.12 sfr_defs.h --- include/avr/sfr_defs.h 22 Apr 2004 17:35:57 -0000 1.12 +++ include/avr/sfr_defs.h 28 Apr 2004 16:08:08 -0000 @@ -245,131 +245,4 @@ #endif /* !__ASSEMBLER__ */ -/* Backwards compatibility, do not use in new programs. */ - -/** \name Deprecated Macros */ -/address@hidden/ - - -/** \def cbi - \ingroup avr_sfr - \deprecated - \code #include \endcode - For backwards compatibility only. This macro will eventually be removed. - - Clear bit \c bit in IO register \c sfr. */ - -#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) - -/** \def sbi - \ingroup avr_sfr - \deprecated - \code #include \endcode - For backwards compatibility only. This macro will eventually be removed. - - Set bit \c bit in IO register \c sfr. */ - -#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) - - - -/** \def inb - \ingroup avr_sfr - \deprecated - \code #include \endcode - For backwards compatibility only. This macro will eventually be removed. - - \par - Use direct access in new programs. */ - -#define inb(sfr) _SFR_BYTE(sfr) - - - -/** \def outb - \ingroup avr_sfr - \deprecated - \code #include \endcode - - For backwards compatibility only. This macro will eventually be removed. - - \par - Use direct access in new programs. - - \note The order of the arguments was switched in older versions of - avr-libc (versions <= 20020203). */ - - -#define outb(sfr, val) (_SFR_BYTE(sfr) = (val)) - -/* The outb/outw macros now have the correct order of arguments. */ - -/** \def inw - \ingroup avr_sfr - \deprecated - \code #include \endcode - For backwards compatibility only. This macro will eventually be removed. - - Read a 16-bit word from IO register pair \c sfr. - - \par - Use direct access in new programs. */ - -#define inw(sfr) _SFR_WORD(sfr) - - -/** \def outw - \ingroup avr_sfr - \deprecated - \code #include \endcode - For backwards compatibility only. This macro will eventually be removed. - - Write the 16-bit value \c val to IO register pair \c sfr. Care - will be taken to write the lower register first. When used to - update 16-bit registers where the timing is critical and the - operation can be interrupted, the programmer is the responsible for - disabling interrupts before accessing the register pair. - - \par - Use direct access in new programs. - - \note The order of the arguments was switched in older versions of - avr-libc (versions <= 20020203). */ - - -#define outw(sfr, val) (_SFR_WORD(sfr) = (val)) - - -/** \def outp - \ingroup avr_sfr - \deprecated - For backwards compatibility only. This macro will eventually be removed. - - \par - Use direct access in new programs. */ - -#define outp(val, sfr) outb(sfr, val) - -/** \def inp - \ingroup avr_sfr - \deprecated - For backwards compatibility only. This macro will eventually be removed. - - \par - Use direct access in new programs. */ - -#define inp(sfr) inb(sfr) - -/** \def BV - \ingroup avr_sfr - \deprecated - For backwards compatibility only. This macro will eventually be removed. - - \par - Use _BV() in new programs. */ - -#define BV(bit) _BV(bit) - -/address@hidden/ - #endif /* _SFR_DEFS_H_ */