Changeset 111 for trunk/82802ab.c

Timestamp:

May 23, 2007 7:20:56 PM (6 years ago)

Author:

stepan

Message:

Original v2 revision: 2689

big cosmetic offensive on flashrom. (trivial)

• Give decent names to virt_addr and virt_addr_2
• add some comments
• move virtual addresses to the end of the struct, so they dont mess up the initializer.

Signed-off-by: Stefan Reinauer <stepan@…>
Acked-by: Stefan Reinauer <stepan@…>

File:

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

trunk/82802ab.c

@@ -49 +49 @@
 int probe_82802ab(struct flashchip *flash)
 {
-        volatile uint8_t *bios = flash->virt_addr;
+        volatile uint8_t *bios = flash->virtual_memory;
+        volatile uint8_t *registers;
         uint8_t id1, id2;
 
@@ -66 +67 @@
         id2 = *(volatile uint8_t *)(bios + 0x01);
 
-#if 1
+        /* Leave ID mode */
         *(volatile uint8_t *)(bios + 0x5555) = 0xAA;
         *(volatile uint8_t *)(bios + 0x2AAA) = 0x55;
         *(volatile uint8_t *)(bios + 0x5555) = 0xF0;
 
-#endif
         myusec_delay(10);
 
@@ -78 +78 @@
         if (id1 == flash->manufacture_id && id2 == flash->model_id) {
                 size_t size = flash->total_size * 1024;
+
                 // we need to mmap the write-protect space. 
-                bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
+                registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
                             fd_mem, (off_t) (0 - 0x400000 - size));
-                if (bios == MAP_FAILED) {
+                if (registers == MAP_FAILED) {
                         // it's this part but we can't map it ...
                         perror("Error MMAP memory using " MEM_DEV);
@@ -87 +88 @@
                 }
 
-                flash->virt_addr_2 = bios;
+                flash->virtual_registers = registers;
                 return 1;
         }
@@ -124 +125 @@
 int erase_82802ab_block(struct flashchip *flash, int offset)
 {
-        volatile uint8_t *bios = flash->virt_addr + offset;
-        volatile uint8_t *wrprotect = flash->virt_addr_2 + offset + 2;
+        volatile uint8_t *bios = flash->virtual_memory + offset;
+        volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2;
         uint8_t status;
 
@@ -142 +143 @@
         myusec_delay(10);
         // now let's see what the register is
-        status = wait_82802ab(flash->virt_addr);
+        status = wait_82802ab(flash->virtual_memory);
         //print_82802ab_status(status);
         printf("DONE BLOCK 0x%x\n", offset);
@@ -179 +180 @@
         int total_size = flash->total_size * 1024;
         int page_size = flash->page_size;
-        volatile uint8_t *bios = flash->virt_addr;
+        volatile uint8_t *bios = flash->virtual_memory;
 
         erase_82802ab(flash);