[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[avr-libc-commit] [2162] 2010-06-11 Eric B.
|
From: |
Eric Weddington |
|
Subject: |
[avr-libc-commit] [2162] 2010-06-11 Eric B. |
|
Date: |
Fri, 11 Jun 2010 17:26:13 +0000 |
Revision: 2162
http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2162
Author: arcanum
Date: 2010-06-11 17:26:12 +0000 (Fri, 11 Jun 2010)
Log Message:
-----------
2010-06-11 Eric B. Weddington <address@hidden>
Atmel bug #11742.
* include/avr/iox128a1u.h: Change EBI_CS_ASPACE* to
EBI_CS_ASIZE*.
* include/avr/iox128a1.h: Same.
* include/avr/iox128a3.h: Same.
* include/avr/iox128d3.h: Same.
* include/avr/iox16a4.h: Same.
* include/avr/iox16d4.h: Same.
* include/avr/iox192a3.h: Same.
* include/avr/iox192d3.h: Same.
* include/avr/iox256a3.h: Same.
* include/avr/iox256a3b.h: Same.
* include/avr/iox256d3.h: Same.
* include/avr/iox32a4.h: Same.
* include/avr/iox32d4.h: Same.
* include/avr/iox64a1.h: Same.
* include/avr/iox64a1u.h: Same.
* include/avr/iox64a3.h: Same.
* include/avr/iox64d3.h: Same.
Ticket Links:
:-----------
http://savannah.gnu.org/bugs/?11742
Modified Paths:
--------------
trunk/avr-libc/ChangeLog
trunk/avr-libc/include/avr/iox128a1.h
trunk/avr-libc/include/avr/iox128a1u.h
trunk/avr-libc/include/avr/iox128a3.h
trunk/avr-libc/include/avr/iox128d3.h
trunk/avr-libc/include/avr/iox16a4.h
trunk/avr-libc/include/avr/iox16d4.h
trunk/avr-libc/include/avr/iox192a3.h
trunk/avr-libc/include/avr/iox192d3.h
trunk/avr-libc/include/avr/iox256a3.h
trunk/avr-libc/include/avr/iox256a3b.h
trunk/avr-libc/include/avr/iox256d3.h
trunk/avr-libc/include/avr/iox32a4.h
trunk/avr-libc/include/avr/iox32d4.h
trunk/avr-libc/include/avr/iox64a1.h
trunk/avr-libc/include/avr/iox64a1u.h
trunk/avr-libc/include/avr/iox64a3.h
trunk/avr-libc/include/avr/iox64d3.h
Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog 2010-06-11 16:17:29 UTC (rev 2161)
+++ trunk/avr-libc/ChangeLog 2010-06-11 17:26:12 UTC (rev 2162)
@@ -1,5 +1,27 @@
2010-06-11 Eric B. Weddington <address@hidden>
+ Atmel bug #11742.
+ * include/avr/iox128a1u.h: Change EBI_CS_ASPACE* to
+ EBI_CS_ASIZE*.
+ * include/avr/iox128a1.h: Same.
+ * include/avr/iox128a3.h: Same.
+ * include/avr/iox128d3.h: Same.
+ * include/avr/iox16a4.h: Same.
+ * include/avr/iox16d4.h: Same.
+ * include/avr/iox192a3.h: Same.
+ * include/avr/iox192d3.h: Same.
+ * include/avr/iox256a3.h: Same.
+ * include/avr/iox256a3b.h: Same.
+ * include/avr/iox256d3.h: Same.
+ * include/avr/iox32a4.h: Same.
+ * include/avr/iox32d4.h: Same.
+ * include/avr/iox64a1.h: Same.
+ * include/avr/iox64a1u.h: Same.
+ * include/avr/iox64a3.h: Same.
+ * include/avr/iox64d3.h: Same.
+
+2010-06-11 Eric B. Weddington <address@hidden>
+
Atmel bug #11738.
* include/avr/iox128d3.h (ADC_FLUSH_bm, ADC_ENABLE_bp): Add missing
definitions.
Modified: trunk/avr-libc/include/avr/iox128a1.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a1.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox128a1.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1596,26 +1596,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -5369,18 +5369,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox128a1u.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a1u.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox128a1u.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1644,26 +1644,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -5877,18 +5877,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox128a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a3.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox128a3.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1596,26 +1596,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -5182,18 +5182,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox128d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox128d3.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox128d3.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Atmel Corporation
+/* Copyright (c) 2009-2010 Atmel Corporation
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -1233,26 +1233,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -4061,18 +4061,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox16a4.h
===================================================================
--- trunk/avr-libc/include/avr/iox16a4.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox16a4.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1596,26 +1596,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -4996,18 +4996,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox16d4.h
===================================================================
--- trunk/avr-libc/include/avr/iox16d4.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox16d4.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1251,26 +1251,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -4015,18 +4015,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox192a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox192a3.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox192a3.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1596,26 +1596,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -5182,18 +5182,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox192d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox192d3.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox192d3.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Atmel Corporation
+/* Copyright (c) 2009-2010 Atmel Corporation
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -1233,26 +1233,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -4061,18 +4061,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox256a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox256a3.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox256a3.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1596,26 +1596,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -5182,18 +5182,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox256a3b.h
===================================================================
--- trunk/avr-libc/include/avr/iox256a3b.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox256a3b.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1580,26 +1580,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -5166,18 +5166,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox256d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox256d3.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox256d3.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Atmel Corporation
+/* Copyright (c) 2009-2010 Atmel Corporation
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -1198,26 +1198,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -3861,18 +3861,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox32a4.h
===================================================================
--- trunk/avr-libc/include/avr/iox32a4.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox32a4.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1596,26 +1596,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -4996,18 +4996,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox32d4.h
===================================================================
--- trunk/avr-libc/include/avr/iox32d4.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox32d4.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Atmel Corporation
+/* Copyright (c) 2009-2010 Atmel Corporation
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -1233,26 +1233,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -3982,18 +3982,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox64a1.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a1.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox64a1.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1596,26 +1596,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -5369,18 +5369,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox64a1u.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a1u.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox64a1u.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1644,26 +1644,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -5616,18 +5616,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox64a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a3.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox64a3.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1596,26 +1596,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -5182,18 +5182,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
Modified: trunk/avr-libc/include/avr/iox64d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox64d3.h 2010-06-11 16:17:29 UTC (rev
2161)
+++ trunk/avr-libc/include/avr/iox64d3.h 2010-06-11 17:26:12 UTC (rev
2162)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Atmel Corporation
+/* Copyright (c) 2009-2010 Atmel Corporation
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -1233,26 +1233,26 @@
} EBI_t;
/* Chip Select adress space */
-typedef enum EBI_CS_ASPACE_enum
+typedef enum EBI_CS_ASIZE_enum
{
- EBI_CS_ASPACE_256B_gc = (0x00<<2), /* 256 bytes */
- EBI_CS_ASPACE_512B_gc = (0x01<<2), /* 512 bytes */
- EBI_CS_ASPACE_1KB_gc = (0x02<<2), /* 1K bytes */
- EBI_CS_ASPACE_2KB_gc = (0x03<<2), /* 2K bytes */
- EBI_CS_ASPACE_4KB_gc = (0x04<<2), /* 4K bytes */
- EBI_CS_ASPACE_8KB_gc = (0x05<<2), /* 8K bytes */
- EBI_CS_ASPACE_16KB_gc = (0x06<<2), /* 16K bytes */
- EBI_CS_ASPACE_32KB_gc = (0x07<<2), /* 32K bytes */
- EBI_CS_ASPACE_64KB_gc = (0x08<<2), /* 64K bytes */
- EBI_CS_ASPACE_128KB_gc = (0x09<<2), /* 128K bytes */
- EBI_CS_ASPACE_256KB_gc = (0x0A<<2), /* 256K bytes */
- EBI_CS_ASPACE_512KB_gc = (0x0B<<2), /* 512K bytes */
- EBI_CS_ASPACE_1MB_gc = (0x0C<<2), /* 1M bytes */
- EBI_CS_ASPACE_2MB_gc = (0x0D<<2), /* 2M bytes */
- EBI_CS_ASPACE_4MB_gc = (0x0E<<2), /* 4M bytes */
- EBI_CS_ASPACE_8MB_gc = (0x0F<<2), /* 8M bytes */
- EBI_CS_ASPACE_16M_gc = (0x10<<2), /* 16M bytes */
-} EBI_CS_ASPACE_t;
+ EBI_CS_ASIZE_256B_gc = (0x00<<2), /* 256 bytes */
+ EBI_CS_ASIZE_512B_gc = (0x01<<2), /* 512 bytes */
+ EBI_CS_ASIZE_1KB_gc = (0x02<<2), /* 1K bytes */
+ EBI_CS_ASIZE_2KB_gc = (0x03<<2), /* 2K bytes */
+ EBI_CS_ASIZE_4KB_gc = (0x04<<2), /* 4K bytes */
+ EBI_CS_ASIZE_8KB_gc = (0x05<<2), /* 8K bytes */
+ EBI_CS_ASIZE_16KB_gc = (0x06<<2), /* 16K bytes */
+ EBI_CS_ASIZE_32KB_gc = (0x07<<2), /* 32K bytes */
+ EBI_CS_ASIZE_64KB_gc = (0x08<<2), /* 64K bytes */
+ EBI_CS_ASIZE_128KB_gc = (0x09<<2), /* 128K bytes */
+ EBI_CS_ASIZE_256KB_gc = (0x0A<<2), /* 256K bytes */
+ EBI_CS_ASIZE_512KB_gc = (0x0B<<2), /* 512K bytes */
+ EBI_CS_ASIZE_1MB_gc = (0x0C<<2), /* 1M bytes */
+ EBI_CS_ASIZE_2MB_gc = (0x0D<<2), /* 2M bytes */
+ EBI_CS_ASIZE_4MB_gc = (0x0E<<2), /* 4M bytes */
+ EBI_CS_ASIZE_8MB_gc = (0x0F<<2), /* 8M bytes */
+ EBI_CS_ASIZE_16M_gc = (0x10<<2), /* 16M bytes */
+} EBI_CS_ASIZE_t;
/* */
typedef enum EBI_CS_SRWS_enum
@@ -4075,18 +4075,18 @@
/* EBI - External Bus Interface */
/* EBI_CS.CTRLA bit masks and bit positions */
-#define EBI_CS_ASPACE_gm 0x7C /* Address Space group mask. */
-#define EBI_CS_ASPACE_gp 2 /* Address Space group position. */
-#define EBI_CS_ASPACE0_bm (1<<2) /* Address Space bit 0 mask. */
-#define EBI_CS_ASPACE0_bp 2 /* Address Space bit 0 position. */
-#define EBI_CS_ASPACE1_bm (1<<3) /* Address Space bit 1 mask. */
-#define EBI_CS_ASPACE1_bp 3 /* Address Space bit 1 position. */
-#define EBI_CS_ASPACE2_bm (1<<4) /* Address Space bit 2 mask. */
-#define EBI_CS_ASPACE2_bp 4 /* Address Space bit 2 position. */
-#define EBI_CS_ASPACE3_bm (1<<5) /* Address Space bit 3 mask. */
-#define EBI_CS_ASPACE3_bp 5 /* Address Space bit 3 position. */
-#define EBI_CS_ASPACE4_bm (1<<6) /* Address Space bit 4 mask. */
-#define EBI_CS_ASPACE4_bp 6 /* Address Space bit 4 position. */
+#define EBI_CS_ASIZE_gm 0x7C /* Address Size group mask. */
+#define EBI_CS_ASIZE_gp 2 /* Address Size group position. */
+#define EBI_CS_ASIZE0_bm (1<<2) /* Address Size bit 0 mask. */
+#define EBI_CS_ASIZE0_bp 2 /* Address Size bit 0 position. */
+#define EBI_CS_ASIZE1_bm (1<<3) /* Address Size bit 1 mask. */
+#define EBI_CS_ASIZE1_bp 3 /* Address Size bit 1 position. */
+#define EBI_CS_ASIZE2_bm (1<<4) /* Address Size bit 2 mask. */
+#define EBI_CS_ASIZE2_bp 4 /* Address Size bit 2 position. */
+#define EBI_CS_ASIZE3_bm (1<<5) /* Address Size bit 3 mask. */
+#define EBI_CS_ASIZE3_bp 5 /* Address Size bit 3 position. */
+#define EBI_CS_ASIZE4_bm (1<<6) /* Address Size bit 4 mask. */
+#define EBI_CS_ASIZE4_bp 6 /* Address Size bit 4 position. */
#define EBI_CS_MODE_gm 0x03 /* Memory Mode group mask. */
#define EBI_CS_MODE_gp 0 /* Memory Mode group position. */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [avr-libc-commit] [2162] 2010-06-11 Eric B.,
Eric Weddington <=