Changeset 1474 for trunk/flashrom.c

Timestamp:

Dec 18, 2011 4:01:24 PM (18 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/flashrom.c (modified) (7 diffs)

trunk/flashrom.c

@@ -360 +360 @@
 }
 
-void chip_writeb(uint8_t val, chipaddr addr)
-{
-        par_programmer->chip_writeb(val, addr);
-}
-
-void chip_writew(uint16_t val, chipaddr addr)
-{
-        par_programmer->chip_writew(val, addr);
-}
-
-void chip_writel(uint32_t val, chipaddr addr)
-{
-        par_programmer->chip_writel(val, addr);
-}
-
-void chip_writen(uint8_t *buf, chipaddr addr, size_t len)
-{
-        par_programmer->chip_writen(buf, addr, len);
-}
-
-uint8_t chip_readb(const chipaddr addr)
-{
-        return par_programmer->chip_readb(addr);
-}
-
-uint16_t chip_readw(const chipaddr addr)
-{
-        return par_programmer->chip_readw(addr);
-}
-
-uint32_t chip_readl(const chipaddr addr)
-{
-        return par_programmer->chip_readl(addr);
-}
-
-void chip_readn(uint8_t *buf, chipaddr addr, size_t len)
-{
-        par_programmer->chip_readn(buf, addr, len);
+void chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr)
+{
+        par_programmer->chip_writeb(flash, val, addr);
+}
+
+void chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr)
+{
+        par_programmer->chip_writew(flash, val, addr);
+}
+
+void chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr)
+{
+        par_programmer->chip_writel(flash, val, addr);
+}
+
+void chip_writen(const struct flashctx *flash, uint8_t *buf, chipaddr addr,
+                 size_t len)
+{
+        par_programmer->chip_writen(flash, buf, addr, len);
+}
+
+uint8_t chip_readb(const struct flashctx *flash, const chipaddr addr)
+{
+        return par_programmer->chip_readb(flash, addr);
+}
+
+uint16_t chip_readw(const struct flashctx *flash, const chipaddr addr)
+{
+        return par_programmer->chip_readw(flash, addr);
+}
+
+uint32_t chip_readl(const struct flashctx *flash, const chipaddr addr)
+{
+        return par_programmer->chip_readl(flash, addr);
+}
+
+void chip_readn(const struct flashctx *flash, uint8_t *buf, chipaddr addr,
+                size_t len)
+{
+        par_programmer->chip_readn(flash, buf, addr, len);
 }
 
@@ -413 +415 @@
 }
 
-int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, int unsigned len)
-{
-        chip_readn(buf, flash->virtual_memory + start, len);
+int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start,
+                   int unsigned len)
+{
+        chip_readn(flash, buf, flash->virtual_memory + start, len);
 
         return 0;
@@ -536 +539 @@
 
 /* start is an offset to the base address of the flash chip */
-int check_erased_range(struct flashctx *flash, unsigned int start, unsigned int len)
+int check_erased_range(struct flashctx *flash, unsigned int start,
+                       unsigned int len)
 {
         int ret;
@@ -559 +563 @@
  * @return      0 for success, -1 for failure
  */
-int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len,
-                 const char *message)
+int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start,
+                 unsigned int len, const char *message)
 {
         unsigned int i;
@@ -1538 +1542 @@
          * after the members copied from struct flashchip.
          */
-        if (sizeof(struct flashchip) != offsetof(struct flashctx, virtual_memory)) {
+        if (sizeof(struct flashchip) !=
+            offsetof(struct flashctx, virtual_memory)) {
                 msg_gerr("struct flashctx broken!\n");
                 ret = 1;
@@ -1619 +1624 @@
  * function signature.
  */
-int chip_safety_check(struct flashctx *flash, int force, int read_it, int write_it, int erase_it, int verify_it)
+int chip_safety_check(struct flashctx *flash, int force, int read_it,
+                      int write_it, int erase_it, int verify_it)
 {
         if (!programmer_may_write && (write_it || erase_it)) {
@@ -1680 +1686 @@
  * Besides that, the function itself is a textbook example of abysmal code flow.
  */
-int doit(struct flashctx *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it)
+int doit(struct flashctx *flash, int force, const char *filename, int read_it,
+         int write_it, int erase_it, int verify_it)
 {
         uint8_t *oldcontents;