Changeset 1474 for trunk/82802ab.c

Timestamp:

12/18/11 16:01:24 (5 months ago)

Author:

hailfinger

Message:

Add struct flashctx * parameter to all functions accessing flash chips.

All programmer access function prototypes except init have been made
static and moved to the respective file.

A few internal functions in flash chip drivers had chipaddr parameters
which are no longer needed.

The lines touched by flashctx changes have been adjusted to 80 columns
except in header files.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Acked-by: Michael Karcher <flashrom@…>

File:

• trunk/82802ab.c (modified) (13 diffs)

trunk/82802ab.c

@@ -48 +48 @@
 
         /* Reset to get a clean state */
-        chip_writeb(0xFF, bios);
+        chip_writeb(flash, 0xFF, bios);
         programmer_delay(10);
 
         /* Enter ID mode */
-        chip_writeb(0x90, bios);
-        programmer_delay(10);
-
-        id1 = chip_readb(bios + (0x00 << shifted));
-        id2 = chip_readb(bios + (0x01 << shifted));
+        chip_writeb(flash, 0x90, bios);
+        programmer_delay(10);
+
+        id1 = chip_readb(flash, bios + (0x00 << shifted));
+        id2 = chip_readb(flash, bios + (0x01 << shifted));
 
         /* Leave ID mode */
-        chip_writeb(0xFF, bios);
+        chip_writeb(flash, 0xFF, bios);
 
         programmer_delay(10);
@@ -72 +72 @@
          * flash contents.
          */
-        flashcontent1 = chip_readb(bios + (0x00 << shifted));
-        flashcontent2 = chip_readb(bios + (0x01 << shifted));
+        flashcontent1 = chip_readb(flash, bios + (0x00 << shifted));
+        flashcontent2 = chip_readb(flash, bios + (0x01 << shifted));
 
         if (id1 == flashcontent1)
@@ -95 +95 @@
         chipaddr bios = flash->virtual_memory;
 
-        chip_writeb(0x70, bios);
-        if ((chip_readb(bios) & 0x80) == 0) {   // it's busy
-                while ((chip_readb(bios) & 0x80) == 0) ;
-        }
-
-        status = chip_readb(bios);
+        chip_writeb(flash, 0x70, bios);
+        if ((chip_readb(flash, bios) & 0x80) == 0) {    // it's busy
+                while ((chip_readb(flash, bios) & 0x80) == 0) ;
+        }
+
+        status = chip_readb(flash, bios);
 
         /* Reset to get a clean state */
-        chip_writeb(0xFF, bios);
+        chip_writeb(flash, 0xFF, bios);
 
         return status;
@@ -114 +114 @@
 
         for (i = 0; i < flash->total_size * 1024; i+= flash->page_size)
-                chip_writeb(0, flash->virtual_registers + i + 2);
+                chip_writeb(flash, 0, flash->virtual_registers + i + 2);
 
         return 0;
@@ -126 +126 @@
 
         // clear status register
-        chip_writeb(0x50, bios + page);
+        chip_writeb(flash, 0x50, bios + page);
 
         // now start it
-        chip_writeb(0x20, bios + page);
-        chip_writeb(0xd0, bios + page);
+        chip_writeb(flash, 0x20, bios + page);
+        chip_writeb(flash, 0xd0, bios + page);
         programmer_delay(10);
 
@@ -142 +142 @@
 
 /* chunksize is 1 */
-int write_82802ab(struct flashctx *flash, uint8_t *src, unsigned int start, unsigned int len)
+int write_82802ab(struct flashctx *flash, uint8_t *src, unsigned int start,
+                  unsigned int len)
 {
         int i;
@@ -149 +150 @@
         for (i = 0; i < len; i++) {
                 /* transfer data from source to destination */
-                chip_writeb(0x40, dst);
-                chip_writeb(*src++, dst++);
+                chip_writeb(flash, 0x40, dst);
+                chip_writeb(flash, *src++, dst++);
                 wait_82802ab(flash);
         }
@@ -165 +166 @@
 
         /* Clear status register */
-        chip_writeb(0x50, bios);
+        chip_writeb(flash, 0x50, bios);
 
         /* Read identifier codes */
-        chip_writeb(0x90, bios);
+        chip_writeb(flash, 0x90, bios);
 
         /* Read master lock-bit */
-        mcfg = chip_readb(bios + 0x3);
+        mcfg = chip_readb(flash, bios + 0x3);
         msg_cdbg("master lock is ");
         if (mcfg) {
@@ -182 +183 @@
         /* Read block lock-bits */
         for (i = 0; i < flash->total_size * 1024; i+= (64 * 1024)) {
-                bcfg = chip_readb(bios + i + 2); // read block lock config
+                bcfg = chip_readb(flash, bios + i + 2); // read block lock config
                 msg_cdbg("block lock at %06x is %slocked!\n", i, bcfg ? "" : "un");
                 if (bcfg) {
@@ -190 +191 @@
 
         /* Reset chip */
-        chip_writeb(0xFF, bios);
+        chip_writeb(flash, 0xFF, bios);
 
         /* Unlock: clear block lock-bits, if needed */
         if (can_unlock && need_unlock) {
                 msg_cdbg("Unlock: ");
-                chip_writeb(0x60, bios);
-                chip_writeb(0xD0, bios);
-                chip_writeb(0xFF, bios);
+                chip_writeb(flash, 0x60, bios);
+                chip_writeb(flash, 0xD0, bios);
+                chip_writeb(flash, 0xFF, bios);
                 msg_cdbg("Done!\n");
         }
@@ -221 +222 @@
 
         /* Read identifier codes */
-        chip_writeb(0x90, bios);
+        chip_writeb(flash, 0x90, bios);
 
         /* Read master lock-bit */
-        mcfg = chip_readb(bios + 0x3);
+        mcfg = chip_readb(flash, bios + 0x3);
         msg_cdbg("master lock is ");
         if (mcfg) {
@@ -236 +237 @@
         for (i = 0; i < flash->total_size * 1024;
              i += (i >= (64 * 1024) ? 64 * 1024 : 8 * 1024)) {
-                bcfg = chip_readb(bios + i + 2); /* read block lock config */
+                bcfg = chip_readb(flash, bios + i + 2); /* read block lock config */
                 msg_cdbg("block lock at %06x is %slocked!\n", i,
                          bcfg ? "" : "un");
@@ -244 +245 @@
 
         /* Reset chip */
-        chip_writeb(0xFF, bios);
+        chip_writeb(flash, 0xFF, bios);
 
         /* Unlock: clear block lock-bits, if needed */
         if (can_unlock && need_unlock) {
                 msg_cdbg("Unlock: ");
-                chip_writeb(0x60, bios);
-                chip_writeb(0xD0, bios);
-                chip_writeb(0xFF, bios);
+                chip_writeb(flash, 0x60, bios);
+                chip_writeb(flash, 0xD0, bios);
+                chip_writeb(flash, 0xFF, bios);
                 wait_82802ab(flash);
                 msg_cdbg("Done!\n");