diff -U6 -N flashrom/flashchips.c flashrom.new/flashchips.c
--- flashrom/flashchips.c	2009-06-12 21:16:05.000000000 +0200
+++ flashrom.new/flashchips.c	2009-06-12 21:15:51.000000000 +0200
@@ -463,13 +463,13 @@
 		.manufacture_id	= ATMEL_ID,
 		.model_id	= AT_29C020,
 		.total_size	= 256,
 		.page_size	= 256,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 10000,			/* 10ms */ 
 		.erase		= erase_chip_jedec,
 		.write		= write_jedec,
 		.read		= read_memmapped,
 	},
 
 	{
@@ -479,13 +479,13 @@
 		.manufacture_id	= ATMEL_ID,
 		.model_id	= AT_29C040A,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 10000,			/* 10 ms */
 		.erase		= erase_chip_jedec,
 		.write		= write_jedec,
 		.read		= read_memmapped,
 	},
 
 	{
@@ -2687,13 +2687,13 @@
 		.manufacture_id	= WINBOND_ID,
 		.model_id	= W_29C020C,
 		.total_size	= 256,
 		.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,
 	},
 
 	{
@@ -2703,13 +2703,13 @@
 		.manufacture_id	= WINBOND_ID,
 		.model_id	= W_29C040P,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 10, 
 		.erase		= erase_chip_jedec,
 		.write		= write_jedec,
 		.read		= read_memmapped,
 	},
 
 	{
@@ -2728,45 +2728,45 @@
 		.read		= read_memmapped,
 	},
 
 	{
 		.vendor		= "Winbond",
 		.name		= "W39V040A",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= WINBOND_ID,
 		.model_id	= W_39V040A,
 		.total_size	= 512,
 		.page_size	= 64*1024,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 10, 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
 	},
 
 	{
 		.vendor		= "Winbond",
 		.name		= "W39V040B",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= WINBOND_ID,
 		.model_id	= W_39V040B,
 		.total_size	= 512,
 		.page_size	= 64*1024,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 10, 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
 	},
 
 	{
 		.vendor		= "Winbond",
 		.name		= "W39V040C",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= WINBOND_ID,
 		.model_id	= W_39V040C,
 		.total_size	= 512,
 		.page_size	= 64*1024,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_w39v040c,
@@ -2776,36 +2776,36 @@
 		.read		= read_memmapped,
 	},
 
 	{
 		.vendor		= "Winbond",
 		.name		= "W39V040FA",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_FWH,
 		.manufacture_id	= WINBOND_ID,
 		.model_id	= W_39V040FA,
 		.total_size	= 512,
 		.page_size	= 64*1024,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 10, 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
 	},
 
 	{
 		.vendor		= "Winbond",
 		.name		= "W39V080A",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= WINBOND_ID,
 		.model_id	= W_39V080A,
 		.total_size	= 1024,
 		.page_size	= 64*1024,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 10, 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
 	},
 
 	{
@@ -2824,29 +2824,29 @@
 		.read		= read_memmapped,
 	},
 
 	{
 		.vendor		= "Winbond",
 		.name		= "W49V002A",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= WINBOND_ID,
 		.model_id	= W_49V002A,
 		.total_size	= 256,
 		.page_size	= 128,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
+		.probe_timing	= 10, 
 		.erase		= erase_chip_jedec,
 		.write		= write_49f002,
 		.read		= read_memmapped,
 	},
 
 	{
 		.vendor		= "Winbond",
 		.name		= "W49V002FA",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_FWH,
 		.manufacture_id	= WINBOND_ID,
 		.model_id	= W_49V002FA,
 		.total_size	= 256,
 		.page_size	= 128,
 		.tested		= TEST_UNTESTED,
 		.probe		= probe_jedec,
@@ -2856,13 +2856,13 @@
 		.read		= read_memmapped,
 	},
 
 	{
 		.vendor		= "Winbond",
 		.name		= "W39V080FA",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_FWH,
 		.manufacture_id	= WINBOND_ID,
 		.model_id	= W_39V080FA,
 		.total_size	= 1024,
 		.page_size	= 64*1024,
 		.tested		= TEST_OK_PREW,
 		.probe		= probe_winbond_fwhub,
@@ -2872,13 +2872,13 @@
 		.read		= read_memmapped,
 	},
 
 	{
 		.vendor		= "Winbond",
 		.name		= "W39V080FA (dual mode)",
-		.bustype	= CHIP_BUSTYPE_NONSPI,
+		.bustype	= CHIP_BUSTYPE_FWH,
 		.manufacture_id	= WINBOND_ID,
 		.model_id	= W_39V080FA_DM,
 		.total_size	= 512,
 		.page_size	= 64*1024,
 		.tested		= TEST_UNTESTED,
 		.probe		= probe_winbond_fwhub,
