Merge branch 'master' into strings

7 files changed, 11 insertions, 62 deletions

diff --git a/src/drivers/ata/aoedev.c b/src/drivers/ata/aoedev.c
deleted file mode 100644
index ff047f103..000000000
--- a/src/drivers/ata/aoedev.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2006 Michael Brown <mbrown@fensystems.co.uk>.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <stddef.h>
-#include <gpxe/async.h>
-#include <gpxe/aoe.h>
-
-/** @file
- *
- * AoE ATA device
- *
- */
-
-/**
- * Issue ATA command via AoE device
- *
- * @v ata		ATA device
- * @v command		ATA command
- * @ret rc		Return status code
- */
-static int aoe_command ( struct ata_device *ata,
-			 struct ata_command *command ) {
-	struct aoe_device *aoedev
-		= container_of ( ata, struct aoe_device, ata );
-	struct async async;
-
-	return async_block ( &async, aoe_issue ( &aoedev->aoe, command,
-						 &async ) );
-}
-
-/**
- * Initialise AoE device
- *
- * @v aoedev		AoE device
- */
-int init_aoedev ( struct aoe_device *aoedev ) {
-	aoedev->ata.command = aoe_command;
-	aoe_open ( &aoedev->aoe );
-	return init_atadev ( &aoedev->ata );
-}
diff --git a/src/drivers/bitbash/spi_bit.c b/src/drivers/bitbash/spi_bit.c
index e2175d603..a4e7136f8 100644
--- a/src/drivers/bitbash/spi_bit.c
+++ b/src/drivers/bitbash/spi_bit.c
@@ -153,6 +153,10 @@ static int spi_bit_rw ( struct spi_bus *bus, struct spi_device *device,
 		= container_of ( bus, struct spi_bit_basher, bus );
 	uint32_t tmp;
 
+	/* Set clock line to idle state */
+	write_bit ( &spibit->basher, SPI_BIT_SCLK, 
+		    ( bus->mode & SPI_MODE_CPOL ) );
+
 	/* Assert chip select on specified slave */
 	spi_bit_set_slave_select ( spibit, device->slave, SELECT_SLAVE );
 
diff --git a/src/drivers/net/bnx2.c b/src/drivers/net/bnx2.c
index 105e9c3f4..fdd6655bb 100644
--- a/src/drivers/net/bnx2.c
+++ b/src/drivers/net/bnx2.c
@@ -43,7 +43,7 @@ static struct bss {
 	struct statistics_block stats_blk;
 } bnx2_bss;
 
-struct bnx2 bnx2;
+static struct bnx2 bnx2;
 
 static struct flash_spec flash_table[] =
 {
diff --git a/src/drivers/net/ns83820.c b/src/drivers/net/ns83820.c
index 8b8500f48..3262ba6ce 100755
--- a/src/drivers/net/ns83820.c
+++ b/src/drivers/net/ns83820.c
@@ -364,7 +364,7 @@ struct ring_desc {
 #endif
 
 /* Private Storage for the NIC */
-struct ns83820_private {
+static struct ns83820_private {
 	u8 *base;
 	int up;
 	long idle;
diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c
index 0328cf2c3..63353e3fe 100644
--- a/src/drivers/net/pcnet32.c
+++ b/src/drivers/net/pcnet32.c
@@ -67,7 +67,7 @@ static struct nic_operations pcnet32_operations;
 
 /* End Etherboot Specific */
 
-int cards_found /* __initdata */ ;
+static int cards_found = 0 /* __initdata */ ;
 
 #ifdef REMOVE
 /* FIXME: Remove these they are probably pointless */
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
index d9854e9c4..08d1c6f62 100644
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -400,7 +400,7 @@ static void rtl8169_hw_PHY_config(struct nic *nic __unused);
 //      20-16   5-bit GMII/MII register address
 //      15-0    16-bit GMII/MII register data
 //=================================================================
-void RTL8169_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value)
+static void RTL8169_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value)
 {
 	int i;
 
@@ -418,7 +418,7 @@ void RTL8169_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value)
 }
 
 //=================================================================
-int RTL8169_READ_GMII_REG(unsigned long ioaddr, int RegAddr)
+static int RTL8169_READ_GMII_REG(unsigned long ioaddr, int RegAddr)
 {
 	int i, value = -1;
 
diff --git a/src/drivers/net/via-velocity.h b/src/drivers/net/via-velocity.h
index e0b8809f1..c296d2899 100644
--- a/src/drivers/net/via-velocity.h
+++ b/src/drivers/net/via-velocity.h
@@ -1204,7 +1204,7 @@ struct velocity_info_tbl {
 	u32 flags;
 };
 
-struct velocity_info_tbl *info;
+static struct velocity_info_tbl *info;
 
 #define mac_hw_mibs_init(regs) {\
 	BYTE_REG_BITS_ON(MIBCR_MIBFRZ,&((regs)->MIBCR));\
@@ -1768,7 +1768,7 @@ struct velocity_opt {
 #define TX_DESC_MAX     256
 #define TX_DESC_DEF     TX_DESC_MIN
 
-struct velocity_info {
+static struct velocity_info {
 //      struct list_head list;
 
 	struct pci_device *pdev;