Changeset 3392 for trunk/util/flashrom/ichspi.c

Timestamp:

06/27/08 17:18:20 (5 months ago)

Author:

stepan

Message:

indent according to development guidelines (trivial)
Signed-off-by: Stefan Reinauer <stepan@…>
Acked-by: Stefan Reinauer <stepan@…>

Files:

• trunk/util/flashrom/ichspi.c (modified) (15 diffs)

trunk/util/flashrom/ichspi.c

@@ -72 +72 @@
 #define SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS  3
 
-
 typedef struct _OPCODE {
         uint8_t opcode;         //This commands spi opcode
@@ -97 +96 @@
 } OPCODES;
 
-
-static OPCODES *curopcodes=NULL;
-
+static OPCODES *curopcodes = NULL;
 
 /* HW access functions */
@@ -105 +102 @@
 {
         volatile uint32_t regval;
-        regval = *(volatile uint32_t *)((uint8_t *)ich_spibar + X);
+        regval = *(volatile uint32_t *)((uint8_t *) ich_spibar + X);
         return regval;
 }
@@ -113 +110 @@
 #define REGWRITE8(X,Y)  (*(uint8_t *)((uint8_t *)ich_spibar+X)=Y)
 
-
 /* Common SPI functions */
 static int program_opcodes(OPCODES * op);
-static int run_opcode(uint8_t nr, OPCODE op, uint32_t offset, uint8_t datalength, uint8_t * data);
-static int ich_spi_read_page(struct flashchip *flash, uint8_t * buf, int Offset);
-static int ich_spi_write_page(struct flashchip *flash, uint8_t * bytes, int Offset);
+static int run_opcode(uint8_t nr, OPCODE op, uint32_t offset,
+                      uint8_t datalength, uint8_t * data);
+static int ich_spi_read_page(struct flashchip *flash, uint8_t * buf,
+                             int Offset);
+static int ich_spi_write_page(struct flashchip *flash, uint8_t * bytes,
+                              int Offset);
 static int ich_spi_erase_block(struct flashchip *flash, int offset);
-
 
 OPCODES O_ST_M25P = {
         {
          JEDEC_WREN,
-         0
-        },
+         0},
         {
-         {JEDEC_BYTE_PROGRAM,   SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS,     1},     // Write Byte
-         {JEDEC_READ,           SPI_OPCODE_TYPE_READ_WITH_ADDRESS,      0},     // Read Data
-         {JEDEC_BE_D8,          SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS,     1},     // Erase Sector
-         {JEDEC_RDSR,           SPI_OPCODE_TYPE_READ_NO_ADDRESS,        0},     // Read Device Status Reg
-         {JEDEC_RES,            SPI_OPCODE_TYPE_READ_WITH_ADDRESS,      0},     // Resume Deep Power-Down
-         {JEDEC_WRSR,           SPI_OPCODE_TYPE_WRITE_NO_ADDRESS,       1},     // Write Status Register
-         {JEDEC_RDID,           SPI_OPCODE_TYPE_READ_NO_ADDRESS,        0},     // Read JDEC ID
-         {JEDEC_CE_C7,          SPI_OPCODE_TYPE_WRITE_NO_ADDRESS,       1},     // Bulk erase
-        }
+         {JEDEC_BYTE_PROGRAM, SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS, 1},   // Write Byte
+         {JEDEC_READ, SPI_OPCODE_TYPE_READ_WITH_ADDRESS, 0},    // Read Data
+         {JEDEC_BE_D8, SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS, 1},  // Erase Sector
+         {JEDEC_RDSR, SPI_OPCODE_TYPE_READ_NO_ADDRESS, 0},      // Read Device Status Reg
+         {JEDEC_RES, SPI_OPCODE_TYPE_READ_WITH_ADDRESS, 0},     // Resume Deep Power-Down
+         {JEDEC_WRSR, SPI_OPCODE_TYPE_WRITE_NO_ADDRESS, 1},     // Write Status Register
+         {JEDEC_RDID, SPI_OPCODE_TYPE_READ_NO_ADDRESS, 0},      // Read JDEC ID
+         {JEDEC_CE_C7, SPI_OPCODE_TYPE_WRITE_NO_ADDRESS, 1},    // Bulk erase
+         }
 };
-
 
 int program_opcodes(OPCODES * op)
@@ -179 +175 @@
 
 int run_opcode(uint8_t nr, OPCODE op, uint32_t offset, uint8_t datalength,
-              uint8_t * data)
+               uint8_t * data)
 {
         int write_cmd = 0;
@@ -276 +272 @@
 }
 
-
 static int ich_spi_erase_block(struct flashchip *flash, int offset)
 {
@@ -297 +292 @@
         int a;
 
-        printf_debug("Spi_Read,Offset=%d,number=%d,buf=%p\n", Offset, page_size, buf);
+        printf_debug("Spi_Read,Offset=%d,number=%d,buf=%p\n", Offset, page_size,
+                     buf);
 
         for (a = 0; a < page_size; a += MAXDATABYTES) {
@@ -326 +322 @@
 
 static int ich_spi_write_page(struct flashchip *flash, uint8_t * bytes,
-                             int Offset)
+                              int Offset)
 {
         int page_size = flash->page_size;
@@ -332 +328 @@
         int a;
 
-        printf_debug("write_page_ichspi,Offset=%d,number=%d,buf=%p\n", Offset, page_size,
-               bytes);
+        printf_debug("write_page_ichspi,Offset=%d,number=%d,buf=%p\n", Offset,
+                     page_size, bytes);
 
         for (a = 0; a < page_size; a += MAXDATABYTES) {
@@ -360 +356 @@
 }
 
-
 int ich_spi_read(struct flashchip *flash, uint8_t * buf)
 {
@@ -369 +364 @@
         for (i = 0; (i < total_size / page_size) && (rc == 0); i++) {
                 rc = ich_spi_read_page(flash, (void *)(buf + i * page_size),
-                                      i * page_size);
+                                       i * page_size);
         }
 
         return rc;
 }
-
 
 int ich_spi_write(struct flashchip *flash, uint8_t * buf)
@@ -393 +387 @@
                         break;
                 }
-                
+
                 for (j = 0; j < erase_size / page_size; j++) {
                         ich_spi_write_page(flash, (void *)(buf + (i * erase_size) + (j * page_size)),
@@ -405 +399 @@
 }
 
-int ich_spi_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr)
+int ich_spi_command(unsigned int writecnt, unsigned int readcnt,
+                    const unsigned char *writearr, unsigned char *readarr)
 {
         int a;
@@ -418 +413 @@
         if (curopcodes == NULL) {
                 printf_debug("Programming OPCODES\n");
-                curopcodes=&O_ST_M25P;
+                curopcodes = &O_ST_M25P;
                 program_opcodes(curopcodes);
         }
@@ -441 +436 @@
         if (opcode->spi_type == SPI_OPCODE_TYPE_READ_WITH_ADDRESS ||
             opcode->spi_type == SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS) {
-                addr = (writearr[1]<<16) |
-                       (writearr[2]<<8)  |
-                       (writearr[3]<<0);
-        }
-        
+                addr = (writearr[1] << 16) |
+                    (writearr[2] << 8) | (writearr[3] << 0);
+        }
+
         /* translate read/write array/count */
         if (opcode->spi_type == SPI_OPCODE_TYPE_WRITE_NO_ADDRESS) {
-                data = (uint8_t*)(writearr+1);
-                count = writecnt-1;
-        }
-        else if (opcode->spi_type == SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS) {
-                data = (uint8_t*)(writearr+4);
-                count = writecnt-4;
-        }
-        else {
-                data = (uint8_t*)readarr;
+                data = (uint8_t *) (writearr + 1);
+                count = writecnt - 1;
+        } else if (opcode->spi_type == SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS) {
+                data = (uint8_t *) (writearr + 4);
+                count = writecnt - 4;
+        } else {
+                data = (uint8_t *) readarr;
                 count = readcnt;
         }
-        
+
         if (run_opcode(opcode_index, *opcode, addr, count, data) != 0) {
                 printf_debug("run OPCODE 0x%02x failed\n", opcode->opcode);