2003-10-17 Theodore A. Roth * include/avr/io.h: Include portpins.h. * include/avr/portpins.h: New file. * include/avr/ioat94k.h: Convert PORTxn to Pxn. * include/avr/iom128.h: Convert PORTxn to Pxn. Move generic PORTn, DDn and PINn to portpins.h. * include/avr/iom162.h: Convert PORTxn to Pxn. * include/avr/iom64.h: Convert PORTxn to Pxn. * include/avr/iotn15.h: Convert PORTxn to Pxn. Index: include/avr/io.h =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io.h,v retrieving revision 1.10 diff -u -p -r1.10 io.h --- include/avr/io.h 28 Feb 2003 23:03:40 -0000 1.10 +++ include/avr/io.h 17 Oct 2003 19:25:57 -0000 @@ -226,6 +226,8 @@ # endif #endif +#include + #if __AVR_ARCH__ != 1 # if XRAMEND < 0x100 && !defined(__COMPILING_AVR_LIBC__) # undef SP Index: include/avr/ioat94k.h =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/include/avr/ioat94k.h,v retrieving revision 1.7 diff -u -p -r1.7 ioat94k.h --- include/avr/ioat94k.h 15 Apr 2003 00:40:06 -0000 1.7 +++ include/avr/ioat94k.h 17 Oct 2003 19:25:57 -0000 @@ -360,14 +360,14 @@ #define PINE0 0 /* PORTD */ -#define PORTD7 7 -#define PORTD6 6 -#define PORTD5 5 -#define PORTD4 4 -#define PORTD3 3 -#define PORTD2 2 -#define PORTD1 1 -#define PORTD0 0 +#define PD7 7 +#define PD6 6 +#define PD5 5 +#define PD4 4 +#define PD3 3 +#define PD2 2 +#define PD1 1 +#define PD0 0 /* PORTE */ /* @@ -380,14 +380,14 @@ PE1 = OC0 / RX0 (alternate) PE0 = ET0 / TX0 (alternate) */ -#define PORTE7 7 -#define PORTE6 6 -#define PORTE5 5 -#define PORTE4 4 -#define PORTE3 3 -#define PORTE2 2 -#define PORTE1 1 -#define PORTE0 0 +#define PE7 7 +#define PE6 6 +#define PE5 5 +#define PE4 4 +#define PE3 3 +#define PE2 2 +#define PE1 1 +#define PE0 0 /* SFIOR */ #define PSR2 1 Index: include/avr/iom128.h =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom128.h,v retrieving revision 1.10 diff -u -p -r1.10 iom128.h --- include/avr/iom128.h 17 Feb 2003 09:57:28 -0000 1.10 +++ include/avr/iom128.h 17 Oct 2003 19:25:57 -0000 @@ -680,36 +680,6 @@ #define PSR0 1 #define PSR321 0 -/* Port Data Register (generic) */ -#define PORT7 7 -#define PORT6 6 -#define PORT5 5 -#define PORT4 4 -#define PORT3 3 -#define PORT2 2 -#define PORT1 1 -#define PORT0 0 - -/* Port Data Direction Register (generic) */ -#define DD7 7 -#define DD6 6 -#define DD5 5 -#define DD4 4 -#define DD3 3 -#define DD2 2 -#define DD1 1 -#define DD0 0 - -/* Port Input Pins (generic) */ -#define PIN7 7 -#define PIN6 6 -#define PIN5 5 -#define PIN4 4 -#define PIN3 3 -#define PIN2 2 -#define PIN1 1 -#define PIN0 0 - /* SPI Status Register - SPSR */ #define SPIF 7 #define WCOL 6 @@ -844,14 +814,14 @@ #define MUX0 0 /* Port A Data Register - PORTA */ -#define PORTA7 7 -#define PORTA6 6 -#define PORTA5 5 -#define PORTA4 4 -#define PORTA3 3 -#define PORTA2 2 -#define PORTA1 1 -#define PORTA0 0 +#define PA7 7 +#define PA6 6 +#define PA5 5 +#define PA4 4 +#define PA3 3 +#define PA2 2 +#define PA1 1 +#define PA0 0 /* Port A Data Direction Register - DDRA */ #define DDA7 7 @@ -874,14 +844,14 @@ #define PINA0 0 /* Port B Data Register - PORTB */ -#define PORTB7 7 -#define PORTB6 6 -#define PORTB5 5 -#define PORTB4 4 -#define PORTB3 3 -#define PORTB2 2 -#define PORTB1 1 -#define PORTB0 0 +#define PB7 7 +#define PB6 6 +#define PB5 5 +#define PB4 4 +#define PB3 3 +#define PB2 2 +#define PB1 1 +#define PB0 0 /* Port B Data Direction Register - DDRB */ #define DDB7 7 @@ -904,14 +874,14 @@ #define PINB0 0 /* Port C Data Register - PORTC */ -#define PORTC7 7 -#define PORTC6 6 -#define PORTC5 5 -#define PORTC4 4 -#define PORTC3 3 -#define PORTC2 2 -#define PORTC1 1 -#define PORTC0 0 +#define PC7 7 +#define PC6 6 +#define PC5 5 +#define PC4 4 +#define PC3 3 +#define PC2 2 +#define PC1 1 +#define PC0 0 /* Port C Data Direction Register - DDRC */ #define DDC7 7 @@ -934,14 +904,14 @@ #define PINC0 0 /* Port D Data Register - PORTD */ -#define PORTD7 7 -#define PORTD6 6 -#define PORTD5 5 -#define PORTD4 4 -#define PORTD3 3 -#define PORTD2 2 -#define PORTD1 1 -#define PORTD0 0 +#define PD7 7 +#define PD6 6 +#define PD5 5 +#define PD4 4 +#define PD3 3 +#define PD2 2 +#define PD1 1 +#define PD0 0 /* Port D Data Direction Register - DDRD */ #define DDD7 7 @@ -964,14 +934,14 @@ #define PIND0 0 /* Port E Data Register - PORTE */ -#define PORTE7 7 -#define PORTE6 6 -#define PORTE5 5 -#define PORTE4 4 -#define PORTE3 3 -#define PORTE2 2 -#define PORTE1 1 -#define PORTE0 0 +#define PE7 7 +#define PE6 6 +#define PE5 5 +#define PE4 4 +#define PE3 3 +#define PE2 2 +#define PE1 1 +#define PE0 0 /* Port E Data Direction Register - DDRE */ #define DDE7 7 @@ -994,14 +964,14 @@ #define PINE0 0 /* Port F Data Register - PORTF */ -#define PORTF7 7 -#define PORTF6 6 -#define PORTF5 5 -#define PORTF4 4 -#define PORTF3 3 -#define PORTF2 2 -#define PORTF1 1 -#define PORTF0 0 +#define PF7 7 +#define PF6 6 +#define PF5 5 +#define PF4 4 +#define PF3 3 +#define PF2 2 +#define PF1 1 +#define PF0 0 /* Port F Data Direction Register - DDRF */ #define DDF7 7 @@ -1024,11 +994,11 @@ #define PINF0 0 /* Port G Data Register - PORTG */ -#define PORTG4 4 -#define PORTG3 3 -#define PORTG2 2 -#define PORTG1 1 -#define PORTG0 0 +#define PG4 4 +#define PG3 3 +#define PG2 2 +#define PG1 1 +#define PG0 0 /* Port G Data Direction Register - DDRG */ #define DDG4 4 Index: include/avr/iom162.h =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom162.h,v retrieving revision 1.6 diff -u -p -r1.6 iom162.h --- include/avr/iom162.h 26 Aug 2003 16:37:17 -0000 1.6 +++ include/avr/iom162.h 17 Oct 2003 19:25:57 -0000 @@ -757,9 +757,9 @@ /* PORTE bit definitions */ -#define PORTE2 2 -#define PORTE1 1 -#define PORTE0 0 +#define PE2 2 +#define PE1 1 +#define PE0 0 Index: include/avr/iom64.h =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom64.h,v retrieving revision 1.6 diff -u -p -r1.6 iom64.h --- include/avr/iom64.h 17 Feb 2003 09:57:28 -0000 1.6 +++ include/avr/iom64.h 17 Oct 2003 19:25:57 -0000 @@ -845,14 +845,14 @@ #define MUX0 0 /* Port A Data Register - PORTA */ -#define PORTA7 7 -#define PORTA6 6 -#define PORTA5 5 -#define PORTA4 4 -#define PORTA3 3 -#define PORTA2 2 -#define PORTA1 1 -#define PORTA0 0 +#define PA7 7 +#define PA6 6 +#define PA5 5 +#define PA4 4 +#define PA3 3 +#define PA2 2 +#define PA1 1 +#define PA0 0 /* Port A Data Direction Register - DDRA */ #define DDA7 7 @@ -875,14 +875,14 @@ #define PINA0 0 /* Port B Data Register - PORTB */ -#define PORTB7 7 -#define PORTB6 6 -#define PORTB5 5 -#define PORTB4 4 -#define PORTB3 3 -#define PORTB2 2 -#define PORTB1 1 -#define PORTB0 0 +#define PB7 7 +#define PB6 6 +#define PB5 5 +#define PB4 4 +#define PB3 3 +#define PB2 2 +#define PB1 1 +#define PB0 0 /* Port B Data Direction Register - DDRB */ #define DDB7 7 @@ -905,14 +905,14 @@ #define PINB0 0 /* Port C Data Register - PORTC */ -#define PORTC7 7 -#define PORTC6 6 -#define PORTC5 5 -#define PORTC4 4 -#define PORTC3 3 -#define PORTC2 2 -#define PORTC1 1 -#define PORTC0 0 +#define PC7 7 +#define PC6 6 +#define PC5 5 +#define PC4 4 +#define PC3 3 +#define PC2 2 +#define PC1 1 +#define PC0 0 /* Port C Data Direction Register - DDRC */ #define DDC7 7 @@ -935,14 +935,14 @@ #define PINC0 0 /* Port D Data Register - PORTD */ -#define PORTD7 7 -#define PORTD6 6 -#define PORTD5 5 -#define PORTD4 4 -#define PORTD3 3 -#define PORTD2 2 -#define PORTD1 1 -#define PORTD0 0 +#define PD7 7 +#define PD6 6 +#define PD5 5 +#define PD4 4 +#define PD3 3 +#define PD2 2 +#define PD1 1 +#define PD0 0 /* Port D Data Direction Register - DDRD */ #define DDD7 7 @@ -965,14 +965,14 @@ #define PIND0 0 /* Port E Data Register - PORTE */ -#define PORTE7 7 -#define PORTE6 6 -#define PORTE5 5 -#define PORTE4 4 -#define PORTE3 3 -#define PORTE2 2 -#define PORTE1 1 -#define PORTE0 0 +#define PE7 7 +#define PE6 6 +#define PE5 5 +#define PE4 4 +#define PE3 3 +#define PE2 2 +#define PE1 1 +#define PE0 0 /* Port E Data Direction Register - DDRE */ #define DDE7 7 @@ -995,14 +995,14 @@ #define PINE0 0 /* Port F Data Register - PORTF */ -#define PORTF7 7 -#define PORTF6 6 -#define PORTF5 5 -#define PORTF4 4 -#define PORTF3 3 -#define PORTF2 2 -#define PORTF1 1 -#define PORTF0 0 +#define PF7 7 +#define PF6 6 +#define PF5 5 +#define PF4 4 +#define PF3 3 +#define PF2 2 +#define PF1 1 +#define PF0 0 /* Port F Data Direction Register - DDRF */ #define DDF7 7 @@ -1025,11 +1025,11 @@ #define PINF0 0 /* Port G Data Register - PORTG */ -#define PORTG4 4 -#define PORTG3 3 -#define PORTG2 2 -#define PORTG1 1 -#define PORTG0 0 +#define PG4 4 +#define PG3 3 +#define PG2 2 +#define PG1 1 +#define PG0 0 /* Port G Data Direction Register - DDRG */ #define DDG4 4 Index: include/avr/iotn15.h =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iotn15.h,v retrieving revision 1.4 diff -u -p -r1.4 iotn15.h --- include/avr/iotn15.h 8 Jan 2003 11:14:10 -0000 1.4 +++ include/avr/iotn15.h 17 Oct 2003 19:25:57 -0000 @@ -204,11 +204,11 @@ */ /* PORTB */ -#define PORTB4 4 -#define PORTB3 3 -#define PORTB2 2 -#define PORTB1 1 -#define PORTB0 0 +#define PB4 4 +#define PB3 3 +#define PB2 2 +#define PB1 1 +#define PB0 0 /* DDRB */ #define DDB4 4 Index: include/avr/portpins.h =================================================================== RCS file: include/avr/portpins.h diff -N include/avr/portpins.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ include/avr/portpins.h 17 Oct 2003 19:25:57 -0000 @@ -0,0 +1,260 @@ +/* Copyright (c) 2003 Theodore A. Roth + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ + +/* $Id$ */ + +#ifndef _AVR_PORTPINS_H_ +#define _AVR_PORTPINS_H_ 1 + +/* This file should only be included from , never directly. */ + +#ifndef _AVR_IO_H_ +# error "Include instead of this file." +#endif + +/* Define Generic PORTn, DDn, and PINn values. */ + +/* Port Data Register (generic) */ +#define PORT7 7 +#define PORT6 6 +#define PORT5 5 +#define PORT4 4 +#define PORT3 3 +#define PORT2 2 +#define PORT1 1 +#define PORT0 0 + +/* Port Data Direction Register (generic) */ +#define DD7 7 +#define DD6 6 +#define DD5 5 +#define DD4 4 +#define DD3 3 +#define DD2 2 +#define DD1 1 +#define DD0 0 + +/* Port Input Pins (generic) */ +#define PIN7 7 +#define PIN6 6 +#define PIN5 5 +#define PIN4 4 +#define PIN3 3 +#define PIN2 2 +#define PIN1 1 +#define PIN0 0 + +/* Define PORTxn values for all possible port pins. */ + +/* PORT A */ + +#if defined(PA0) +# define PORTA0 PA0 +#endif +#if defined(PA1) +# define PORTA1 PA1 +#endif +#if defined(PA2) +# define PORTA2 PA2 +#endif +#if defined(PA3) +# define PORTA3 PA3 +#endif +#if defined(PA4) +# define PORTA4 PA4 +#endif +#if defined(PA5) +# define PORTA5 PA5 +#endif +#if defined(PA6) +# define PORTA6 PA6 +#endif +#if defined(PA7) +# define PORTA7 PA7 +#endif + +/* PORT B */ + +#if defined(PB0) +# define PORTB0 PB0 +#endif +#if defined(PB1) +# define PORTB1 PB1 +#endif +#if defined(PB2) +# define PORTB2 PB2 +#endif +#if defined(PB3) +# define PORTB3 PB3 +#endif +#if defined(PB4) +# define PORTB4 PB4 +#endif +#if defined(PB5) +# define PORTB5 PB5 +#endif +#if defined(PB6) +# define PORTB6 PB6 +#endif +#if defined(PB7) +# define PORTB7 PB7 +#endif + +/* PORT C */ + +#if defined(PC0) +# define PORTC0 PC0 +#endif +#if defined(PC1) +# define PORTC1 PC1 +#endif +#if defined(PC2) +# define PORTC2 PC2 +#endif +#if defined(PC3) +# define PORTC3 PC3 +#endif +#if defined(PC4) +# define PORTC4 PC4 +#endif +#if defined(PC5) +# define PORTC5 PC5 +#endif +#if defined(PC6) +# define PORTC6 PC6 +#endif +#if defined(PC7) +# define PORTC7 PC7 +#endif + +/* PORT D */ + +#if defined(PD0) +# define PORTD0 PD0 +#endif +#if defined(PD1) +# define PORTD1 PD1 +#endif +#if defined(PD2) +# define PORTD2 PD2 +#endif +#if defined(PD3) +# define PORTD3 PD3 +#endif +#if defined(PD4) +# define PORTD4 PD4 +#endif +#if defined(PD5) +# define PORTD5 PD5 +#endif +#if defined(PD6) +# define PORTD6 PD6 +#endif +#if defined(PD7) +# define PORTD7 PD7 +#endif + +/* PORT E */ + +#if defined(PE0) +# define PORTE0 PE0 +#endif +#if defined(PE1) +# define PORTE1 PE1 +#endif +#if defined(PE2) +# define PORTE2 PE2 +#endif +#if defined(PE3) +# define PORTE3 PE3 +#endif +#if defined(PE4) +# define PORTE4 PE4 +#endif +#if defined(PE5) +# define PORTE5 PE5 +#endif +#if defined(PE6) +# define PORTE6 PE6 +#endif +#if defined(PE7) +# define PORTE7 PE7 +#endif + +/* PORT F */ + +#if defined(PF0) +# define PORTF0 PF0 +#endif +#if defined(PF1) +# define PORTF1 PF1 +#endif +#if defined(PF2) +# define PORTF2 PF2 +#endif +#if defined(PF3) +# define PORTF3 PF3 +#endif +#if defined(PF4) +# define PORTF4 PF4 +#endif +#if defined(PF5) +# define PORTF5 PF5 +#endif +#if defined(PF6) +# define PORTF6 PF6 +#endif +#if defined(PF7) +# define PORTF7 PF7 +#endif + +/* PORT G */ + +#if defined(PG0) +# define PORTG0 PG0 +#endif +#if defined(PG1) +# define PORTG1 PG1 +#endif +#if defined(PG2) +# define PORTG2 PG2 +#endif +#if defined(PG3) +# define PORTG3 PG3 +#endif +#if defined(PG4) +# define PORTG4 PG4 +#endif +#if defined(PG5) +# define PORTG5 PG5 +#endif +#if defined(PG6) +# define PORTG6 PG6 +#endif +#if defined(PG7) +# define PORTG7 PG7 +#endif + +#endif /* _AVR_PORTPINS_H_ */