diff --git a/flash.h b/flash.h
index 2bf4462..aa97c19 100644
--- a/flash.h
+++ b/flash.h
@@ -385,6 +385,8 @@
 #define IM_29F004T		0xAF
 
 #define INTEL_ID		0x89	/* Intel */
+#define I_82802AB			0xAD
+#define I_82802AC			0xAC
 #define P28F001BXT		0x94	/* 28F001BX-T */
 #define P28F001BXB		0x95	/* 28F001BX-B */
 
@@ -503,7 +505,7 @@
 #define SST_29EE512		0x5D
 #define SST_29EE010		0x07
 #define SST_29LE010		0x08	/* also SST29VE010 */
-#define SST_29EE020A		0x10
+#define SST_29EE020A		0x10	/* also SST29EE020 */
 #define SST_29LE020		0x12	/* also SST29VE020 */
 #define SST_29SF020		0x24
 #define SST_29VF020		0x25
@@ -516,6 +518,7 @@
 #define SST_39VF010		0xD5
 #define SST_39VF020		0xD6
 #define SST_39VF040		0xD7
+#define SST_39VF080		0xD8
 #define SST_49LF040B		0x50
 #define SST_49LF040		0x51
 #define SST_49LF020		0x61
@@ -545,6 +548,11 @@
 #define ST_M25P32		0x2016
 #define ST_M25P64		0x2017
 #define ST_M25P128		0x2018
+#define ST_M25PE10		0x8011
+#define ST_M25PE20		0x8012
+#define ST_M25PE40		0x8013
+#define ST_M25PE80		0x8014
+#define ST_M25PE16		0x8015
 #define ST_M50FLW040A		0x08
 #define ST_M50FLW040B		0x28
 #define ST_M50FLW080A		0x80
@@ -592,6 +600,7 @@
 #define W_39V040FA		0x34
 #define W_39V040A		0x3D
 #define W_39V040B		0x54
+#define W_39V040C		0x50
 #define W_39V080A		0xD0
 #define W_39V080FA		0xD3
 #define W_39V080FA_DM		0x93
diff --git a/flashchips.c b/flashchips.c
index 5489ea8..261819c 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -1083,9 +1083,9 @@
 	{
 		.vendor		= "Intel",
 		.name		= "82802AB",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_FWH,
 		.manufacture_id	= INTEL_ID,
-		.model_id	= 173,
+		.model_id	= I_82802AB,
 		.total_size	= 512,
 		.page_size	= 64 * 1024,
 		.tested		= TEST_OK_PREW,
@@ -1099,9 +1099,9 @@
 	{
 		.vendor		= "Intel",
 		.name		= "82802AC",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_FWH,
 		.manufacture_id	= INTEL_ID,
-		.model_id	= 172,
+		.model_id	= I_82802AC,
 		.total_size	= 1024,
 		.page_size	= 64 * 1024,
 		.tested		= TEST_OK_PREW,
@@ -1341,7 +1341,7 @@
 		.name		= "M25PE10",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ST_ID,
-		.model_id	= 0x8011,
+		.model_id	= ST_M25PE10,
 		.total_size	= 128,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -1357,7 +1357,7 @@
 		.name		= "M25PE20",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ST_ID,
-		.model_id	= 0x8012,
+		.model_id	= ST_M25PE20,
 		.total_size	= 256,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -1373,7 +1373,7 @@
 		.name		= "M25PE40",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ST_ID,
-		.model_id	= 0x8013,
+		.model_id	= ST_M25PE40,
 		.total_size	= 256,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -1389,7 +1389,7 @@
 		.name		= "M25PE80",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ST_ID,
-		.model_id	= 0x8014,
+		.model_id	= ST_M25PE80,
 		.total_size	= 1024,
 		.page_size	= 256,
 		.tested		= TEST_OK_PREW,
@@ -1405,7 +1405,7 @@
 		.name		= "M25PE16",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ST_ID,
-		.model_id	= 0x8015,
+		.model_id	= ST_M25PE16,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -1644,8 +1644,8 @@
 		.vendor		= "SST",
 		.name		= "SST25VF040.REMS",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= 0xbf,
-		.model_id	= 0x44,
+		.manufacture_id	= SST_ID,
+		.model_id	= SST_25VF040_REMS,
 		.total_size	= 512,
 		.page_size	= 64*1024,
 		.tested		= TEST_OK_PR,
@@ -1660,8 +1660,8 @@
 		.vendor		= "SST",
 		.name		= "SST25VF040B.REMS",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= 0xbf,
-		.model_id	= 0x8d,
+		.manufacture_id	= SST_ID,
+		.model_id	= SST_25VF040B_REMS,
 		.total_size	= 512,
 		.page_size	= 64*1024,
 		.tested		= TEST_OK_PR,
@@ -1714,7 +1714,7 @@
 		.page_size	= 128,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 10, 
 		.erase		= erase_chip_jedec,
 		.write		= write_jedec,
 		.read		= read_memmapped,
@@ -1730,7 +1730,7 @@
 		.page_size	= 128,
 		.tested		= TEST_UNTESTED,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 10, 
 		.erase		= erase_chip_jedec,
 		.write		= write_jedec,
 		.read		= read_memmapped,
@@ -1762,7 +1762,7 @@
 		.page_size	= 128,
 		.tested		= TEST_UNTESTED,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 10, 
 		.erase		= erase_chip_jedec,
 		.write		= write_jedec,
 		.read		= read_memmapped,
@@ -1778,7 +1778,7 @@
 		.page_size	= 4096,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 1,			/* 150 ns */
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
@@ -1794,7 +1794,7 @@
 		.page_size	= 4096,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 1,			/* 150 ns */ 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
@@ -1810,7 +1810,7 @@
 		.page_size	= 4096,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 1,			/* 150 ns */ 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
@@ -1826,7 +1826,7 @@
 		.page_size	= 4096,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 1,			/* 150 ns*/ 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
@@ -1842,7 +1842,7 @@
 		.page_size	= 4096,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 1,			/* 150 ns */ 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
@@ -1858,7 +1858,7 @@
 		.page_size	= 4096,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 1,			/* 150 ns */ 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
@@ -1874,7 +1874,7 @@
 		.page_size	= 4096,
 		.tested		= TEST_OK_PROBE,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 1,			/* 150 ns */ 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
@@ -1884,13 +1884,13 @@
 		.vendor		= "SST",
 		.name		= "SST39VF080",
 		.bustype	= CHIP_BUSTYPE_NONSPI,
-		.manufacture_id	= 0xbf,
-		.model_id	= 0xd8,
+		.manufacture_id	= SST_ID,
+		.model_id	= SST_39VF080,
 		.total_size	= 1024,
 		.page_size	= 4096,
 		.tested		= TEST_UNTESTED,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 1,			/* 150 ns */ 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
@@ -2011,14 +2011,14 @@
 	{
 		.vendor		= "SST",
 		.name		= "SST49LF020",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= SST_ID,
 		.model_id	= SST_49LF020,
 		.total_size	= 256,
 		.page_size	= 16 * 1024,
 		.tested		= TEST_OK_PR,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 1,			/* 150 ns */ 
 		.erase		= erase_49lf040,
 		.write		= write_49lf040,
 		.read		= read_memmapped,
@@ -2027,14 +2027,14 @@
 	{
 		.vendor		= "SST",
 		.name		= "SST49LF020A",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= SST_ID,
 		.model_id	= SST_49LF020A,
 		.total_size	= 256,
 		.page_size	= 16 * 1024,
 		.tested		= TEST_UNTESTED,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 1,			/* 150 ns */ 
 		.erase		= erase_49lf040,
 		.write		= write_49lf040,
 		.read		= read_memmapped,
@@ -2043,14 +2043,14 @@
 	{
 		.vendor		= "SST",
 		.name		= "SST49LF040",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= SST_ID,
 		.model_id	= SST_49LF040,
 		.total_size	= 512,
 		.page_size	= 4096,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 1,			/* 150 ns */ 
 		.erase		= erase_49lf040,
 		.write		= write_49lf040,
 		.read		= read_memmapped,
@@ -2765,7 +2765,7 @@
 		.name		= "W39V040C",
 		.bustype	= CHIP_BUSTYPE_NONSPI,
 		.manufacture_id	= WINBOND_ID,
-		.model_id	= 0x50,
+		.model_id	= W_39V040C,
 		.total_size	= 512,
 		.page_size	= 64*1024,
 		.tested		= TEST_OK_PREW,