[flashrom] [commit] r1085 - trunk

[repository service]

Author: hailfinger
Date: Sat Jul 17 14:54:09 2010
New Revision: 1085
URL: http://flashrom.org/trac/coreboot/changeset/1085

Log:
Change the SPI bitbanging core to fix a subtle bug (which had no effect
so far) and to make integration of the RayeR SPIPGM and Nvidia
MCP6x/MCP7x SPI patches easier.
Kill a few global variables and require explicit initialization of
bitbanging delay.

A big thank you to Johannes Sjölund for testing an earlier version of
the code as part of the Nvidia MCP6x/MCP7x SPI bitbanging patch.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Michael Karcher

Modified:
   trunk/bitbang_spi.c
   trunk/flash.h
   trunk/hwaccess.h

Modified: trunk/bitbang_spi.c
==============================================================================
--- trunk/bitbang_spi.c	Sat Jul 17 12:42:34 2010	(r1084)
+++ trunk/bitbang_spi.c	Sat Jul 17 14:54:09 2010	(r1085)
@@ -26,46 +26,55 @@
 #include "chipdrivers.h"
 #include "spi.h"

-/* Length of half a clock period in usecs */
-int bitbang_spi_half_period = 0;
+/* Length of half a clock period in usecs. */
+static int bitbang_spi_half_period;

-enum bitbang_spi_master bitbang_spi_master = BITBANG_SPI_INVALID;
+static enum bitbang_spi_master bitbang_spi_master = BITBANG_SPI_INVALID;

-const struct bitbang_spi_master_entry bitbang_spi_master_table[] = {
+static const struct bitbang_spi_master_entry bitbang_spi_master_table[] = {
    {}, /* This entry corresponds to BITBANG_SPI_INVALID. */
 };

const int bitbang_spi_master_count = ARRAY_SIZE(bitbang_spi_master_table);

-void bitbang_spi_set_cs(int val)
+/* Note that CS# is active low, so val=0 means the chip is active. */
+static void bitbang_spi_set_cs(int val)
 {
    bitbang_spi_master_table[bitbang_spi_master].set_cs(val);
 }

-void bitbang_spi_set_sck(int val)
+static void bitbang_spi_set_sck(int val)
 {
    bitbang_spi_master_table[bitbang_spi_master].set_sck(val);
 }

-void bitbang_spi_set_mosi(int val)
+static void bitbang_spi_set_mosi(int val)
 {
    bitbang_spi_master_table[bitbang_spi_master].set_mosi(val);
 }

-int bitbang_spi_get_miso(void)
+static int bitbang_spi_get_miso(void)
 {
    return bitbang_spi_master_table[bitbang_spi_master].get_miso();
 }

-int bitbang_spi_init(void)
+int bitbang_spi_init(enum bitbang_spi_master master, int halfperiod)
 {
+	bitbang_spi_master = master;
+	bitbang_spi_half_period = halfperiod;
+
+	if (bitbang_spi_master == BITBANG_SPI_INVALID) {
+		msg_perr("Invalid bitbang SPI master. \n"
+			 "Please report a bug at [e-mail]\n");
+		return 1;
+	}
    bitbang_spi_set_cs(1);
    bitbang_spi_set_sck(0);
-	buses_supported = CHIP_BUSTYPE_SPI;
+	bitbang_spi_set_mosi(0);
    return 0;
 }

-uint8_t bitbang_spi_readwrite_byte(uint8_t val)
+static uint8_t bitbang_spi_readwrite_byte(uint8_t val)
 {
    uint8_t ret = 0;
    int i;

Modified: trunk/flash.h
==============================================================================
--- trunk/flash.h	Sat Jul 17 12:42:34 2010	(r1084)
+++ trunk/flash.h	Sat Jul 17 14:54:09 2010	(r1085)
@@ -133,8 +133,6 @@

extern const int bitbang_spi_master_count;

-extern enum bitbang_spi_master bitbang_spi_master;
-
 struct bitbang_spi_master_entry {
    void (*set_cs) (int val);
    void (*set_sck) (int val);
@@ -533,9 +531,7 @@
 int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len);

/* bitbang_spi.c */
-extern int bitbang_spi_half_period;
-extern const struct bitbang_spi_master_entry bitbang_spi_master_table[];
-int bitbang_spi_init(void);
+int bitbang_spi_init(enum bitbang_spi_master master, int halfperiod);
 int bitbang_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr);
 int bitbang_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len);
 int bitbang_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len);

Modified: trunk/hwaccess.h
==============================================================================
--- trunk/hwaccess.h	Sat Jul 17 12:42:34 2010	(r1084)
+++ trunk/hwaccess.h	Sat Jul 17 14:54:09 2010	(r1085)
@@ -176,6 +176,10 @@
 #define __DARWIN__
 #endif

+/* Clarification about OUTB/OUTW/OUTL argument order:
+ * OUT[BWL](val, port)
+ */
+
 #if defined(__FreeBSD__) || defined(__DragonFly__)
   #include <machine/cpufunc.h>
   #define off64_t off_t