# HG changeset patch
# User gthomas
# Date 1038266396 0
# Node ID c4fa19c99259533caa7d1307b0f2a70c7a2b1379
# Parent  d684a6e002a2e489027114947f1f068feb6f8b0f
Improve 16as8 functionality

diff --git a/packages/devs/flash/amd/am29xxxxx/current/ChangeLog b/packages/devs/flash/amd/am29xxxxx/current/ChangeLog
--- a/packages/devs/flash/amd/am29xxxxx/current/ChangeLog
+++ b/packages/devs/flash/amd/am29xxxxx/current/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-25  Gary Thomas  <gthomas@ecoscentric.com>
+
+	* include/flash_am29xxxxx_parts.inl (CYGHWR_DEVS_FLASH_AMD_AM29DL640D):
+	Now tested in 16 bit configurations.
+
+	* include/flash_am29xxxxx.inl: Fix problems with CYGNUM_FLASH_16AS8.
+	The definition was inconsistent/confusing.
+
 2002-10-11  Gary Thomas  <gary@mlbassoc.com>
 
 	* include/flash_am29xxxxx_parts.inl: 
diff --git a/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx.inl b/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx.inl
--- a/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx.inl
+++ b/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx.inl
@@ -89,6 +89,12 @@
 #define FLASH_unlocked                  FLASHWORD( 0x00 )
 
 #ifndef CYGNUM_FLASH_16AS8
+#define _16AS8 0
+#else
+#define _16AS8 CYGNUM_FLASH_16AS8
+#endif
+
+#if (_16AS8 == 0)
 # define FLASH_Setup_Addr1              (0x555)
 # define FLASH_Setup_Addr2              (0x2AA)
 # define FLASH_VendorID_Addr            (0)
diff --git a/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx_parts.inl b/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx_parts.inl
--- a/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx_parts.inl
+++ b/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx_parts.inl
@@ -480,7 +480,6 @@
     },
 #endif
 #ifdef CYGHWR_DEVS_FLASH_AMD_AM29LV320D
-#warning *** Untested ***
     {   // AM29LV320DT
         device_id  : FLASHWORD(0x01F6),
         block_size : 0x10000 * CYGNUM_FLASH_INTERLEAVE,
@@ -502,7 +501,7 @@
         banked     : false
     },
     {   // AM29LV320D
-        device_id  : FLASHWORD(0x01F9),
+        device_id  : FLASHWORD(0x22F9),
         block_size : 0x10000 * CYGNUM_FLASH_INTERLEAVE,
         block_count: 64,
         device_size: 0x400000 * CYGNUM_FLASH_INTERLEAVE,