From 86d42b7bfbab62f09d73d95108808cf15716375a Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 23 Jan 2010 19:04:43 +0000
Subject: [PATCH] rename urj_bus_avr32_bus_driver to urj_bus_avr32_bus to match
 all other bus drivers

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1710 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 urjtag/ChangeLog       | 3 +++
 urjtag/src/bus/avr32.c | 2 +-
 urjtag/src/bus/buses.c | 2 +-
 urjtag/src/bus/buses.h | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index bafa7cb2..c5bfbfc1 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -30,6 +30,9 @@
 
   * include/urjtag/bitmask.h, include/urjtag/fclock.h: Punt UNUSED cruft.
 
+  * src/bus/avr32.c, src/bus/buses.c, src/bus/buses.h: Rename the avr32 bus
+    driver to match the common convention.
+
 2010-01-22  Mike Frysinger  <vapier@gentoo.org>
 
   * src/cmd/cmd_bit.c (cmd_bit_print_params): Fix strncat length handling.
diff --git a/urjtag/src/bus/avr32.c b/urjtag/src/bus/avr32.c
index 9631dfec..139472f7 100644
--- a/urjtag/src/bus/avr32.c
+++ b/urjtag/src/bus/avr32.c
@@ -801,7 +801,7 @@ avr32_bus_write (urj_bus_t *bus, uint32_t addr, uint32_t data)
     }
 }
 
-const urj_bus_driver_t urj_bus_avr32_bus_driver = {
+const urj_bus_driver_t urj_bus_avr32_bus = {
     "avr32",
     N_("Atmel AVR32 multi-mode bus driver, requires <mode> parameter\n"
        "           valid <mode> parameters:\n"
diff --git a/urjtag/src/bus/buses.c b/urjtag/src/bus/buses.c
index efaf64c3..03b362ca 100644
--- a/urjtag/src/bus/buses.c
+++ b/urjtag/src/bus/buses.c
@@ -43,7 +43,7 @@ const urj_bus_driver_t *urj_bus_drivers[] = {
     &urj_bus_au1500_bus,
 #endif
 #ifdef ENABLE_BUS_AVR32
-    &urj_bus_avr32_bus_driver,
+    &urj_bus_avr32_bus,
 #endif
 #ifdef ENABLE_BUS_BCM1250
     &urj_bus_bcm1250_bus,
diff --git a/urjtag/src/bus/buses.h b/urjtag/src/bus/buses.h
index 7f6a40af..a8917fea 100644
--- a/urjtag/src/bus/buses.h
+++ b/urjtag/src/bus/buses.h
@@ -27,7 +27,7 @@
 
 extern const urj_bus_driver_t urj_bus_arm9tdmi_bus;
 extern const urj_bus_driver_t urj_bus_au1500_bus;
-extern const urj_bus_driver_t urj_bus_avr32_bus_driver;
+extern const urj_bus_driver_t urj_bus_avr32_bus;
 extern const urj_bus_driver_t urj_bus_bcm1250_bus;
 extern const urj_bus_driver_t urj_bus_bf526_ezkit_bus;
 extern const urj_bus_driver_t urj_bus_bf527_ezkit_bus;