2003-10-20  Theodore A. Roth  <address@hidden>

	* include/avr/iom128.h:
	* include/avr/portpins.h:
	Move generic PORTn, DDn and PINn defs to portpins.h.

Index: include/avr/iom128.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom128.h,v
retrieving revision 1.11
diff -u -p -r1.11 iom128.h
--- include/avr/iom128.h	20 Oct 2003 18:45:28 -0000	1.11
+++ include/avr/iom128.h	20 Oct 2003 18:50:21 -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
Index: include/avr/portpins.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/portpins.h,v
retrieving revision 1.1
diff -u -p -r1.1 portpins.h
--- include/avr/portpins.h	20 Oct 2003 18:45:28 -0000	1.1
+++ include/avr/portpins.h	20 Oct 2003 18:50:21 -0000
@@ -34,6 +34,38 @@
 #  error "Include <avr/io.h> 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 */