From ae9798787d9a25864c7e8d2e62a277d88ae48a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnim=20L=C3=A4uger?= <arniml@users.sourceforge.net>
Date: Mon, 9 Jun 2008 22:19:48 +0000
Subject: [PATCH] [ 1984813 ] Bus driver cleanup, second step of part 4)
 (Hartley Sweeten) generic_bus_read() added

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1278 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 jtag/ChangeLog               | 16 ++++++++++++++++
 jtag/src/bus/au1500.c        | 13 +------------
 jtag/src/bus/avr32.c         | 17 +----------------
 jtag/src/bus/bcm1250.c       | 17 ++++-------------
 jtag/src/bus/bf533_ezkit.c   | 13 +------------
 jtag/src/bus/bf533_stamp.c   | 13 +------------
 jtag/src/bus/bf537_stamp.c   | 17 +++--------------
 jtag/src/bus/bf548_ezkit.c   | 13 +------------
 jtag/src/bus/bf561_ezkit.c   | 13 +------------
 jtag/src/bus/ejtag.c         | 13 +------------
 jtag/src/bus/fjmem.c         | 13 +------------
 jtag/src/bus/generic_bus.c   | 11 +++++++++++
 jtag/src/bus/generic_bus.h   |  1 +
 jtag/src/bus/h7202.c         | 13 +------------
 jtag/src/bus/ixp425.c        | 13 +------------
 jtag/src/bus/jopcyc.c        | 13 +------------
 jtag/src/bus/lh7a400.c       | 13 +------------
 jtag/src/bus/mpc5200.c       | 13 +------------
 jtag/src/bus/mpc824x.c       | 13 +------------
 jtag/src/bus/ppc405ep.c      | 17 +----------------
 jtag/src/bus/ppc440gx_ebc8.c | 13 +------------
 jtag/src/bus/prototype.c     | 17 +----------------
 jtag/src/bus/pxa2x0.c        | 15 ++-------------
 jtag/src/bus/s3c4510x.c      | 13 +------------
 jtag/src/bus/sa1110.c        | 13 +------------
 jtag/src/bus/sh7727.c        | 13 +------------
 jtag/src/bus/sh7750r.c       | 13 +------------
 jtag/src/bus/sh7751r.c       | 13 +------------
 jtag/src/bus/sharc21065l.c   | 13 +------------
 jtag/src/bus/slsup3.c        | 16 +---------------
 jtag/src/bus/tx4925.c        | 13 +------------
 jtag/src/bus/zefant-xs3.c    | 13 +------------
 32 files changed, 63 insertions(+), 367 deletions(-)

diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index fbe6eb1a..3be0a2e9 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,19 @@
+2008-06-10  Arnim Laeuger  <arniml@users.sourceforge.net>
+
+   * src/bus/au1500.c, src/bus/avr32.c, src/bus/bcm1250.c,
+     src/bus/bf533_ezkit.c, src/bus/bf533_stamp.c, src/bus/bf537_stamp.c,
+     src/bus/bf548_ezkit.c, src/bus/bf561_ezkit.c, src/bus/ejtag.c,
+     src/bus/fjmem.c, src/bus/generic_bus.c, src/bus/generic_bus.h,
+     src/bus/h7202.c, src/bus/ixp425.c, src/bus/jopcyc.c,
+     src/bus/lh7a400.c, src/bus/mpc5200.c, src/bus/mpc824x.c,
+     src/bus/ppc405ep.c, src/bus/ppc440gx_ebc8.c, src/bus/prototype.c,
+     src/bus/pxa2x0.c, src/bus/s3c4510x.c, src/bus/sa1110.c,
+     src/bus/sh7727.c, src/bus/sh7750r.c, src/bus/sh7751r.c,
+     src/bus/sharc21065l.c, src/bus/slsup3.c, src/bus/tx4925.c,
+     src/bus/zefant-xs3.c:
+     [ 1984813 ] Bus driver cleanup, second step of part 4) (Hartley Sweeten)
+     generic_bus_read() added
+
 2008-06-09  Arnim Laeuger  <arniml@users.sourceforge.net>
 
    * src/bus/bf548_ezkit.c, src/bus/fjmem.c, src/bus/ppc405ep.c,
diff --git a/jtag/src/bus/au1500.c b/jtag/src/bus/au1500.c
index 59a5376d..1d291d3e 100644
--- a/jtag/src/bus/au1500.c
+++ b/jtag/src/bus/au1500.c
@@ -299,17 +299,6 @@ au1500_bus_read_end( bus_t *bus )
 	return get_data_out( bus );
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-au1500_bus_read( bus_t *bus, uint32_t adr )
-{
-	au1500_bus_read_start( bus, adr );
-	return au1500_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -356,7 +345,7 @@ const bus_driver_t au1500_bus = {
 	au1500_bus_read_start,
 	au1500_bus_read_next,
 	au1500_bus_read_end,
-	au1500_bus_read,
+	generic_bus_read,
 	au1500_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/avr32.c b/jtag/src/bus/avr32.c
index 04ced148..6f8febe4 100644
--- a/jtag/src/bus/avr32.c
+++ b/jtag/src/bus/avr32.c
@@ -735,21 +735,6 @@ avr32_bus_read_next (bus_t * bus, uint32_t addr)
   return data;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-avr32_bus_read (bus_t * bus, uint32_t addr)
-{
-  uint32_t ret;
-
-  avr32_bus_read_start (bus, addr);
-  ret = avr32_bus_read_end (bus);
-
-  return ret;
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -796,7 +781,7 @@ const bus_driver_t avr32_bus_driver = {
   avr32_bus_read_start,
   avr32_bus_read_next,
   avr32_bus_read_end,
-  avr32_bus_read,
+  generic_bus_read,
   avr32_bus_write,
   NULL
 };
diff --git a/jtag/src/bus/bcm1250.c b/jtag/src/bus/bcm1250.c
index 6a453557..501f2ed1 100644
--- a/jtag/src/bus/bcm1250.c
+++ b/jtag/src/bus/bcm1250.c
@@ -285,19 +285,6 @@ bcm1250_bus_read_end( bus_t *bus )
 	}
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-bcm1250_bus_read( bus_t *bus, uint32_t adr )
-{
-	uint32_t i;
-	bcm1250_bus_read_start( bus, adr );
-	i=bcm1250_bus_read_end( bus );
-	return i;
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -543,7 +530,11 @@ const bus_driver_t bcm1250_bus = {
 	bcm1250_bus_read_start,
 	bcm1250_bus_read_next,
 	bcm1250_bus_read_end,
+#ifndef USE_BCM_EJTAG
+	generic_bus_read,
+#else
 	bcm1250_bus_read,
+#endif
 	bcm1250_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/bf533_ezkit.c b/jtag/src/bus/bf533_ezkit.c
index d1abd442..6d0ccadc 100644
--- a/jtag/src/bus/bf533_ezkit.c
+++ b/jtag/src/bus/bf533_ezkit.c
@@ -355,17 +355,6 @@ bf533_ezkit_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-bf533_ezkit_bus_read( bus_t *bus, uint32_t adr )
-{
-	bf533_ezkit_bus_read_start( bus, adr );
-	return bf533_ezkit_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -404,7 +393,7 @@ const bus_driver_t bf533_ezkit_bus = {
 	bf533_ezkit_bus_read_start,
 	bf533_ezkit_bus_read_next,
 	bf533_ezkit_bus_read_end,
-	bf533_ezkit_bus_read,
+	generic_bus_read,
 	bf533_ezkit_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/bf533_stamp.c b/jtag/src/bus/bf533_stamp.c
index a1dd5f66..bc1d9ad8 100644
--- a/jtag/src/bus/bf533_stamp.c
+++ b/jtag/src/bus/bf533_stamp.c
@@ -353,17 +353,6 @@ bf533_stamp_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-bf533_stamp_bus_read( bus_t *bus, uint32_t adr )
-{
-	bf533_stamp_bus_read_start( bus, adr );
-	return bf533_stamp_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -402,7 +391,7 @@ const bus_driver_t bf533_stamp_bus = {
 	bf533_stamp_bus_read_start,
 	bf533_stamp_bus_read_next,
 	bf533_stamp_bus_read_end,
-	bf533_stamp_bus_read,
+	generic_bus_read,
 	bf533_stamp_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/bf537_stamp.c b/jtag/src/bus/bf537_stamp.c
index 0ae455d1..ec0fde59 100644
--- a/jtag/src/bus/bf537_stamp.c
+++ b/jtag/src/bus/bf537_stamp.c
@@ -339,17 +339,6 @@ bf537_stamp_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-bf537_stamp_bus_read( bus_t *bus, uint32_t adr )
-{
-	bf537_stamp_bus_read_start( bus, adr );
-	return bf537_stamp_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -419,7 +408,7 @@ const bus_driver_t bf537_stamp_bus = {
 	bf537_stamp_bus_read_start,
 	bf537_stamp_bus_read_next,
 	bf537_stamp_bus_read_end,
-	bf537_stamp_bus_read,
+	generic_bus_read,
 	bf537_stamp_bus_write,
 	NULL
 };
@@ -468,7 +457,7 @@ const bus_driver_t bf537_ezkit_bus = {
 	bf537_stamp_bus_read_start,
 	bf537_stamp_bus_read_next,
 	bf537_stamp_bus_read_end,
-	bf537_stamp_bus_read,
+	generic_bus_read,
 	bf537_stamp_bus_write,
 	NULL
 };
@@ -517,7 +506,7 @@ const bus_driver_t bf527_ezkit_bus = {
 	bf537_stamp_bus_read_start,
 	bf537_stamp_bus_read_next,
 	bf537_stamp_bus_read_end,
-	bf537_stamp_bus_read,
+	generic_bus_read,
 	bf537_stamp_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/bf548_ezkit.c b/jtag/src/bus/bf548_ezkit.c
index c115ad9c..de0590f7 100644
--- a/jtag/src/bus/bf548_ezkit.c
+++ b/jtag/src/bus/bf548_ezkit.c
@@ -343,17 +343,6 @@ bf548_ezkit_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-bf548_ezkit_bus_read( bus_t *bus, uint32_t adr )
-{
-	bf548_ezkit_bus_read_start( bus, adr );
-	return bf548_ezkit_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -392,7 +381,7 @@ const bus_driver_t bf548_ezkit_bus = {
 	bf548_ezkit_bus_read_start,
 	bf548_ezkit_bus_read_next,
 	bf548_ezkit_bus_read_end,
-	bf548_ezkit_bus_read,
+	generic_bus_read,
 	bf548_ezkit_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/bf561_ezkit.c b/jtag/src/bus/bf561_ezkit.c
index f08b1901..c977848e 100644
--- a/jtag/src/bus/bf561_ezkit.c
+++ b/jtag/src/bus/bf561_ezkit.c
@@ -368,17 +368,6 @@ bf561_ezkit_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-bf561_ezkit_bus_read( bus_t *bus, uint32_t adr )
-{
-	bf561_ezkit_bus_read_start( bus, adr );
-	return bf561_ezkit_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -415,7 +404,7 @@ const bus_driver_t bf561_ezkit_bus = {
 	bf561_ezkit_bus_read_start,
 	bf561_ezkit_bus_read_next,
 	bf561_ezkit_bus_read_end,
-	bf561_ezkit_bus_read,
+	generic_bus_read,
 	bf561_ezkit_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/ejtag.c b/jtag/src/bus/ejtag.c
index 7a166cf3..6d19f6af 100644
--- a/jtag/src/bus/ejtag.c
+++ b/jtag/src/bus/ejtag.c
@@ -456,17 +456,6 @@ ejtag_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-ejtag_bus_read( bus_t *bus, uint32_t adr )
-{
-	ejtag_bus_read_start( bus, adr );
-	return ejtag_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -518,7 +507,7 @@ const bus_driver_t ejtag_bus = {
 	ejtag_bus_read_start,
 	ejtag_bus_read_next,
 	ejtag_bus_read_end,
-	ejtag_bus_read,
+	generic_bus_read,
 	ejtag_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/fjmem.c b/jtag/src/bus/fjmem.c
index 840b63e1..853ee965 100644
--- a/jtag/src/bus/fjmem.c
+++ b/jtag/src/bus/fjmem.c
@@ -690,17 +690,6 @@ fjmem_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-fjmem_bus_read( bus_t *bus, uint32_t adr )
-{
-	fjmem_bus_read_start( bus, adr );
-	return fjmem_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -743,7 +732,7 @@ const bus_driver_t fjmem_bus = {
 	fjmem_bus_read_start,
 	fjmem_bus_read_next,
 	fjmem_bus_read_end,
-	fjmem_bus_read,
+	generic_bus_read,
 	fjmem_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/generic_bus.c b/jtag/src/bus/generic_bus.c
index 7b16ba4c..d8191338 100644
--- a/jtag/src/bus/generic_bus.c
+++ b/jtag/src/bus/generic_bus.c
@@ -38,3 +38,14 @@ generic_bus_free( bus_t *bus )
 	free( bus->params );
 	free( bus );
 }
+
+/**
+ * bus->driver->(*read)
+ *
+ */
+uint32_t
+generic_bus_read( bus_t *bus, uint32_t adr )
+{
+	bus_read_start( bus, adr );
+	return bus_read_end( bus );
+}
diff --git a/jtag/src/bus/generic_bus.h b/jtag/src/bus/generic_bus.h
index 18b8faf2..debf6d52 100644
--- a/jtag/src/bus/generic_bus.h
+++ b/jtag/src/bus/generic_bus.h
@@ -28,5 +28,6 @@
 #include "bus.h"
 
 void generic_bus_free( bus_t *bus );
+uint32_t generic_bus_read( bus_t *bus, uint32_t adr );
 
 #endif /* GENERIC_BUS_H */
diff --git a/jtag/src/bus/h7202.c b/jtag/src/bus/h7202.c
index c26f6c1f..b86fb41c 100644
--- a/jtag/src/bus/h7202.c
+++ b/jtag/src/bus/h7202.c
@@ -290,17 +290,6 @@ h7202_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-h7202_bus_read( bus_t *bus, uint32_t adr )
-{
-	h7202_bus_read_start( bus, adr );
-	return h7202_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -351,7 +340,7 @@ const bus_driver_t h7202_bus = {
 	h7202_bus_read_start,
 	h7202_bus_read_next,
 	h7202_bus_read_end,
-	h7202_bus_read,
+	generic_bus_read,
 	h7202_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/ixp425.c b/jtag/src/bus/ixp425.c
index 7979dfff..8af59484 100644
--- a/jtag/src/bus/ixp425.c
+++ b/jtag/src/bus/ixp425.c
@@ -297,17 +297,6 @@ ixp425_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-ixp425_bus_read( bus_t *bus, uint32_t adr )
-{
-	ixp425_bus_read_start( bus, adr );
-	return ixp425_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -344,7 +333,7 @@ const bus_driver_t ixp425_bus = {
 	ixp425_bus_read_start,
 	ixp425_bus_read_next,
 	ixp425_bus_read_end,
-	ixp425_bus_read,
+	generic_bus_read,
 	ixp425_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/jopcyc.c b/jtag/src/bus/jopcyc.c
index 3b6e97ad..28ad46c0 100644
--- a/jtag/src/bus/jopcyc.c
+++ b/jtag/src/bus/jopcyc.c
@@ -640,17 +640,6 @@ jopcyc_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-jopcyc_bus_read( bus_t *bus, uint32_t adr )
-{
-	jopcyc_bus_read_start( bus, adr );
-	return jopcyc_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -704,7 +693,7 @@ const bus_driver_t jopcyc_bus = {
 	jopcyc_bus_read_start,
 	jopcyc_bus_read_next,
 	jopcyc_bus_read_end,
-	jopcyc_bus_read,
+	generic_bus_read,
 	jopcyc_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/lh7a400.c b/jtag/src/bus/lh7a400.c
index a2d782bd..cfd98610 100644
--- a/jtag/src/bus/lh7a400.c
+++ b/jtag/src/bus/lh7a400.c
@@ -327,17 +327,6 @@ lh7a400_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-lh7a400_bus_read( bus_t *bus, uint32_t adr )
-{
-	lh7a400_bus_read_start( bus, adr );
-	return lh7a400_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -377,7 +366,7 @@ const bus_driver_t lh7a400_bus = {
 	lh7a400_bus_read_start,
 	lh7a400_bus_read_next,
 	lh7a400_bus_read_end,
-	lh7a400_bus_read,
+	generic_bus_read,
 	lh7a400_bus_write,
     NULL
 };
diff --git a/jtag/src/bus/mpc5200.c b/jtag/src/bus/mpc5200.c
index 53b643f5..ed0b9f02 100644
--- a/jtag/src/bus/mpc5200.c
+++ b/jtag/src/bus/mpc5200.c
@@ -304,17 +304,6 @@ mpc5200_bus_read_end( bus_t *bus )
 	return get_data( bus, LAST_ADR );
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-mpc5200_bus_read( bus_t *bus, uint32_t adr )
-{
-	mpc5200_bus_read_start( bus, adr );
-	return mpc5200_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -355,7 +344,7 @@ const bus_driver_t mpc5200_bus = {
 	mpc5200_bus_read_start,
 	mpc5200_bus_read_next,
 	mpc5200_bus_read_end,
-	mpc5200_bus_read,
+	generic_bus_read,
 	mpc5200_bus_write,
     NULL
 };
diff --git a/jtag/src/bus/mpc824x.c b/jtag/src/bus/mpc824x.c
index fb179f9d..96e714d2 100644
--- a/jtag/src/bus/mpc824x.c
+++ b/jtag/src/bus/mpc824x.c
@@ -532,17 +532,6 @@ mpc824x_bus_read_end( bus_t *bus )
 	return get_data( bus, LAST_ADR );
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-mpc824x_bus_read( bus_t *bus, uint32_t adr )
-{
-	mpc824x_bus_read_start( bus, adr );
-	return mpc824x_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -587,7 +576,7 @@ const bus_driver_t mpc824x_bus = {
 	mpc824x_bus_read_start,
 	mpc824x_bus_read_next,
 	mpc824x_bus_read_end,
-	mpc824x_bus_read,
+	generic_bus_read,
 	mpc824x_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/ppc405ep.c b/jtag/src/bus/ppc405ep.c
index 5b45b974..fc1ac720 100644
--- a/jtag/src/bus/ppc405ep.c
+++ b/jtag/src/bus/ppc405ep.c
@@ -272,21 +272,6 @@ ppc405ep_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-ppc405ep_bus_read( bus_t *bus, uint32_t adr )
-{
-	int res;
-
-	ppc405ep_bus_read_start( bus, adr );
-	res = ppc405ep_bus_read_end( bus );
-
-	return res;
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -324,7 +309,7 @@ const bus_driver_t ppc405ep_bus = {
 	ppc405ep_bus_read_start,
 	ppc405ep_bus_read_next,
 	ppc405ep_bus_read_end,
-	ppc405ep_bus_read,
+	generic_bus_read,
 	ppc405ep_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/ppc440gx_ebc8.c b/jtag/src/bus/ppc440gx_ebc8.c
index 8b287b99..232fce4d 100644
--- a/jtag/src/bus/ppc440gx_ebc8.c
+++ b/jtag/src/bus/ppc440gx_ebc8.c
@@ -274,17 +274,6 @@ ppc440gx_ebc8_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-ppc440gx_ebc8_bus_read( bus_t *bus, uint32_t adr )
-{
-	ppc440gx_ebc8_bus_read_start( bus, adr );
-	return ppc440gx_ebc8_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -322,7 +311,7 @@ const bus_driver_t ppc440gx_ebc8_bus = {
 	ppc440gx_ebc8_bus_read_start,
 	ppc440gx_ebc8_bus_read_next,
 	ppc440gx_ebc8_bus_read_end,
-	ppc440gx_ebc8_bus_read,
+	generic_bus_read,
 	ppc440gx_ebc8_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/prototype.c b/jtag/src/bus/prototype.c
index 7571d235..b7f16eea 100644
--- a/jtag/src/bus/prototype.c
+++ b/jtag/src/bus/prototype.c
@@ -423,21 +423,6 @@ prototype_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-prototype_bus_read( bus_t *bus, uint32_t adr )
-{
-	int res;
-
-	prototype_bus_read_start( bus, adr );
-	res = prototype_bus_read_end( bus );
-
-	return res;
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -477,7 +462,7 @@ const bus_driver_t prototype_bus = {
 	prototype_bus_read_start,
 	prototype_bus_read_next,
 	prototype_bus_read_end,
-	prototype_bus_read,
+	generic_bus_read,
 	prototype_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/pxa2x0.c b/jtag/src/bus/pxa2x0.c
index d16a081e..c5a82eb0 100644
--- a/jtag/src/bus/pxa2x0.c
+++ b/jtag/src/bus/pxa2x0.c
@@ -786,17 +786,6 @@ pxa2xx_bus_read_end( bus_t *bus )
 	return 0;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-pxa2xx_bus_read( bus_t *bus, uint32_t adr )
-{
-	pxa2xx_bus_read_start( bus, adr );
-	return pxa2xx_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -849,7 +838,7 @@ const bus_driver_t pxa2x0_bus = {
 	pxa2xx_bus_read_start,
 	pxa2xx_bus_read_next,
 	pxa2xx_bus_read_end,
-	pxa2xx_bus_read,
+	generic_bus_read,
 	pxa2xx_bus_write,
 	NULL /* patch 909598 call pxax0_bus_init, but the patch fails and doesnt look compatible */
 };
@@ -865,7 +854,7 @@ const bus_driver_t pxa27x_bus = {
 	pxa2xx_bus_read_start,
 	pxa2xx_bus_read_next,
 	pxa2xx_bus_read_end,
-	pxa2xx_bus_read,
+	generic_bus_read,
 	pxa2xx_bus_write,
 	pxa2xx_bus_init
 };
diff --git a/jtag/src/bus/s3c4510x.c b/jtag/src/bus/s3c4510x.c
index 794b401f..2300d877 100644
--- a/jtag/src/bus/s3c4510x.c
+++ b/jtag/src/bus/s3c4510x.c
@@ -391,17 +391,6 @@ s3c4510_bus_read_end( bus_t *bus )
         return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-s3c4510_bus_read( bus_t *bus, uint32_t adr )
-{
-        s3c4510_bus_read_start( bus, adr );
-        return s3c4510_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -457,7 +446,7 @@ const bus_driver_t s3c4510_bus = {
         s3c4510_bus_read_start,
         s3c4510_bus_read_next,
         s3c4510_bus_read_end,
-        s3c4510_bus_read,
+        generic_bus_read,
 	s3c4510_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/sa1110.c b/jtag/src/bus/sa1110.c
index ec9d99ba..06c06d2b 100644
--- a/jtag/src/bus/sa1110.c
+++ b/jtag/src/bus/sa1110.c
@@ -301,17 +301,6 @@ sa1110_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-sa1110_bus_read( bus_t *bus, uint32_t adr )
-{
-	sa1110_bus_read_start( bus, adr );
-	return sa1110_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -361,7 +350,7 @@ const bus_driver_t sa1110_bus = {
 	sa1110_bus_read_start,
 	sa1110_bus_read_next,
 	sa1110_bus_read_end,
-	sa1110_bus_read,
+	generic_bus_read,
 	sa1110_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/sh7727.c b/jtag/src/bus/sh7727.c
index 4d878d0e..63f05432 100644
--- a/jtag/src/bus/sh7727.c
+++ b/jtag/src/bus/sh7727.c
@@ -337,17 +337,6 @@ sh7727_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-sh7727_bus_read( bus_t *bus, uint32_t adr )
-{
-	sh7727_bus_read_start( bus, adr );
-	return sh7727_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -409,7 +398,7 @@ const bus_driver_t sh7727_bus = {
 	sh7727_bus_read_start,
 	sh7727_bus_read_next,
 	sh7727_bus_read_end,
-	sh7727_bus_read,
+	generic_bus_read,
 	sh7727_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/sh7750r.c b/jtag/src/bus/sh7750r.c
index 147d3422..177f54a3 100644
--- a/jtag/src/bus/sh7750r.c
+++ b/jtag/src/bus/sh7750r.c
@@ -316,17 +316,6 @@ sh7750r_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-sh7750r_bus_read( bus_t *bus, uint32_t adr )
-{
-	sh7750r_bus_read_start( bus, adr );
-	return sh7750r_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -391,7 +380,7 @@ const bus_driver_t sh7750r_bus = {
 	sh7750r_bus_read_start,
 	sh7750r_bus_read_next,
 	sh7750r_bus_read_end,
-	sh7750r_bus_read,
+	generic_bus_read,
 	sh7750r_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/sh7751r.c b/jtag/src/bus/sh7751r.c
index db9dd808..22bb3515 100644
--- a/jtag/src/bus/sh7751r.c
+++ b/jtag/src/bus/sh7751r.c
@@ -301,17 +301,6 @@ sh7751r_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-sh7751r_bus_read( bus_t *bus, uint32_t adr )
-{
-	sh7751r_bus_read_start( bus, adr );
-	return sh7751r_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -373,7 +362,7 @@ const bus_driver_t sh7751r_bus = {
 	sh7751r_bus_read_start,
 	sh7751r_bus_read_next,
 	sh7751r_bus_read_end,
-	sh7751r_bus_read,
+	generic_bus_read,
 	sh7751r_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/sharc21065l.c b/jtag/src/bus/sharc21065l.c
index c38d53bf..d138188c 100644
--- a/jtag/src/bus/sharc21065l.c
+++ b/jtag/src/bus/sharc21065l.c
@@ -314,17 +314,6 @@ sharc_21065L_bus_read_end( bus_t *bus )
 	return 0;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-sharc_21065L_bus_read( bus_t *bus, uint32_t adr )
-{
-	sharc_21065L_bus_read_start( bus, adr );
-	return sharc_21065L_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -365,7 +354,7 @@ const bus_driver_t sharc_21065L_bus = {
 	sharc_21065L_bus_read_start,
 	sharc_21065L_bus_read_next,
 	sharc_21065L_bus_read_end,
-	sharc_21065L_bus_read,
+	generic_bus_read,
 	sharc_21065L_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/slsup3.c b/jtag/src/bus/slsup3.c
index df4e739c..1e258ad7 100644
--- a/jtag/src/bus/slsup3.c
+++ b/jtag/src/bus/slsup3.c
@@ -450,20 +450,6 @@ slsup3_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-slsup3_bus_read( bus_t *bus, uint32_t adr )
-{
-        uint32_t d;
-
-	slsup3_bus_read_start( bus, adr );
-	d = slsup3_bus_read_end( bus );
-	return d;
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -515,7 +501,7 @@ const bus_driver_t slsup3_bus = {
 	slsup3_bus_read_start,
 	slsup3_bus_read_next,
 	slsup3_bus_read_end,
-	slsup3_bus_read,
+	generic_bus_read,
 	slsup3_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/tx4925.c b/jtag/src/bus/tx4925.c
index 16ba2fdf..fabe359d 100644
--- a/jtag/src/bus/tx4925.c
+++ b/jtag/src/bus/tx4925.c
@@ -326,17 +326,6 @@ tx4925_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-tx4925_bus_read( bus_t *bus, uint32_t adr )
-{
-	tx4925_bus_read_start( bus, adr );
-	return tx4925_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -373,7 +362,7 @@ const bus_driver_t tx4925_bus = {
 	tx4925_bus_read_start,
 	tx4925_bus_read_next,
 	tx4925_bus_read_end,
-	tx4925_bus_read,
+	generic_bus_read,
 	tx4925_bus_write,
 	NULL
 };
diff --git a/jtag/src/bus/zefant-xs3.c b/jtag/src/bus/zefant-xs3.c
index 26ca5f61..a97de6f8 100644
--- a/jtag/src/bus/zefant-xs3.c
+++ b/jtag/src/bus/zefant-xs3.c
@@ -852,17 +852,6 @@ zefant_xs3_bus_read_end( bus_t *bus )
 	return d;
 }
 
-/**
- * bus->driver->(*read)
- *
- */
-static uint32_t
-zefant_xs3_bus_read( bus_t *bus, uint32_t adr )
-{
-	zefant_xs3_bus_read_start( bus, adr );
-	return zefant_xs3_bus_read_end( bus );
-}
-
 /**
  * bus->driver->(*write)
  *
@@ -981,7 +970,7 @@ const bus_driver_t zefant_xs3_bus = {
 	zefant_xs3_bus_read_start,
 	zefant_xs3_bus_read_next,
 	zefant_xs3_bus_read_end,
-	zefant_xs3_bus_read,
+	generic_bus_read,
 	zefant_xs3_bus_write,
 	NULL
 };