Author: hailfinger
Date: 2009-06-23 02:47:26 +0200 (Tue, 23 Jun 2009)
New Revision: 623
Modified:
trunk/sb600spi.c
Log:
SB600 SPI: Kill unused variable.
Make a few local functions in sb600spi.c static.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net>
Acked-by: Luc Verhaegen <libv(a)skynet.be>
Modified: trunk/sb600spi.c
===================================================================
--- trunk/sb600spi.c 2009-06-22 11:14:43 UTC (rev 622)
+++ trunk/sb600spi.c 2009-06-23 00:47:26 UTC (rev 623)
@@ -25,18 +25,19 @@
#include "flash.h"
#include "spi.h"
-struct sb600_spi_controller {
- unsigned int spi_cntrl0; /* 00h */
- unsigned int restrictedcmd1; /* 04h */
- unsigned int restrictedcmd2; /* 08h */
- unsigned int spi_cntrl1; /* 0ch */
- unsigned int spi_cmdvalue0; /* 10h */
- unsigned int spi_cmdvalue1; /* 14h */
- unsigned int spi_cmdvalue2; /* 18h */
- unsigned int spi_fakeid; /* 1Ch */
-};
+/* This struct is unused, but helps visualize the SB600 SPI BAR layout.
+ *struct sb600_spi_controller {
+ * unsigned int spi_cntrl0; / * 00h * /
+ * unsigned int restrictedcmd1; / * 04h * /
+ * unsigned int restrictedcmd2; / * 08h * /
+ * unsigned int spi_cntrl1; / * 0ch * /
+ * unsigned int spi_cmdvalue0; / * 10h * /
+ * unsigned int spi_cmdvalue1; / * 14h * /
+ * unsigned int spi_cmdvalue2; / * 18h * /
+ * unsigned int spi_fakeid; / * 1Ch * /
+ *};
+ */
-struct sb600_spi_controller *spi_bar = NULL;
uint8_t *sb600_spibar;
int sb600_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len)
@@ -86,7 +87,7 @@
return rc;
}
-void reset_internal_fifo_pointer(void)
+static void reset_internal_fifo_pointer(void)
{
mmio_writeb(mmio_readb(sb600_spibar + 2) | 0x10, sb600_spibar + 2);
@@ -94,7 +95,7 @@
printf("reset\n");
}
-void execute_command(void)
+static void execute_command(void)
{
mmio_writeb(mmio_readb(sb600_spibar + 2) | 1, sb600_spibar + 2);
@@ -111,8 +112,6 @@
writecnt--;
- spi_bar = (struct sb600_spi_controller *) sb600_spibar;
-
printf_debug("%s, cmd=%x, writecnt=%x, readcnt=%x\n",
__func__, cmd, writecnt, readcnt);