flashrom: Beautify flash chip ID verbose printout a little, always use %02x.

[coreboot.git] / util / flashrom / m29f400bt.c

diff --git a/util/flashrom/m29f400bt.c b/util/flashrom/m29f400bt.c
index e33c1068b359228fce7a769a2f744b160e03f810..d0b040de2da488960ba3c9673d4887acb38123ce 100644 (file)
--- a/util/flashrom/m29f400bt.c
+++ b/util/flashrom/m29f400bt.c
@@ -1,61 +1,25 @@
 /*
- * m29f400bt.c: driver for programming JEDEC standard flash parts
+ * This file is part of the flashrom project.
  *
+ * Copyright (C) 2000 Silicon Integrated System Corporation
  *
- * Copyright 2000 Silicon Integrated System Corporation
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- * Reference:
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "flash.h"
 
-void toggle_ready_m29f400bt(volatile uint8_t *dst)
-{
-       unsigned int i = 0;
-       uint8_t tmp1, tmp2;
-
-       tmp1 = *dst & 0x40;
-
-       while (i++ < 0xFFFFFF) {
-               tmp2 = *dst & 0x40;
-               if (tmp1 == tmp2) {
-                       break;
-               }
-               tmp1 = tmp2;
-       }
-}
-
-void data_polling_m29f400bt(volatile uint8_t *dst, uint8_t data)
-{
-       unsigned int i = 0;
-       uint8_t tmp;
-
-       data &= 0x80;
-
-       while (i++ < 0xFFFFFF) {
-               tmp = *dst & 0x80;
-               if (tmp == data) {
-                       break;
-               }
-       }
-}
-
 void protect_m29f400bt(volatile uint8_t *bios)
 {
        *(volatile uint8_t *)(bios + 0xAAA) = 0xAA;
@@ -79,7 +43,7 @@ void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src,
                *dst = *src;
                //*(volatile char *) (bios) = 0xF0;
                //usleep(5);
-               toggle_ready_m29f400bt(dst);
+               toggle_ready_jedec(dst);
                printf
                    ("Value in the flash at address %p = %#x, want %#x\n",
                     (uint8_t *) (dst - bios), *dst, *src);
@@ -100,6 +64,9 @@ int probe_m29f400bt(struct flashchip *flash)
        myusec_delay(10);
 
        id1 = *(volatile uint8_t *)bios;
+       /* The data sheet says id2 is at (bios + 0x01) and id2 listed in
+        * flash.h does not match. It should be possible to use JEDEC probe.
+        */
        id2 = *(volatile uint8_t *)(bios + 0x02);
 
        *(volatile uint8_t *)(bios + 0xAAA) = 0xAA;
@@ -108,7 +75,7 @@ int probe_m29f400bt(struct flashchip *flash)
 
        myusec_delay(10);
 
-       printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
+       printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
 
        if (id1 == flash->manufacture_id && id2 == flash->model_id)
                return 1;
@@ -129,9 +96,9 @@ int erase_m29f400bt(struct flashchip *flash)
        *(volatile uint8_t *)(bios + 0xAAA) = 0x10;
 
        myusec_delay(10);
-       toggle_ready_m29f400bt(bios);
+       toggle_ready_jedec(bios);
 
-       return (0);
+       return 0;
 }
 
 int block_erase_m29f400bt(volatile uint8_t *bios, volatile uint8_t *dst)
@@ -147,9 +114,9 @@ int block_erase_m29f400bt(volatile uint8_t *bios, volatile uint8_t *dst)
        *dst = 0x30;
 
        myusec_delay(10);
-       toggle_ready_m29f400bt(bios);
+       toggle_ready_jedec(bios);
 
-       return (0);
+       return 0;
 }
 
 int write_m29f400bt(struct flashchip *flash, uint8_t *buf)
@@ -160,7 +127,7 @@ int write_m29f400bt(struct flashchip *flash, uint8_t *buf)
        volatile uint8_t *bios = flash->virtual_memory;
 
        //erase_m29f400bt (flash);
-       printf("Programming Page:\n ");
+       printf("Programming page:\n ");
        /*********************************
        *Pages for M29F400BT:
        * 16    0x7c000         0x7ffff         TOP
@@ -204,14 +171,14 @@ int write_m29f400bt(struct flashchip *flash, uint8_t *buf)
        printf("\n");
        //protect_m29f400bt (bios);
 
-       return (0);
+       return 0;
 }
 
-int write_linuxbios_m29f400bt(struct flashchip *flash, uint8_t *buf)
+int write_coreboot_m29f400bt(struct flashchip *flash, uint8_t *buf)
 {
        volatile uint8_t *bios = flash->virtual_memory;
 
-       printf("Programming Page:\n ");
+       printf("Programming page:\n ");
        /*********************************
        *Pages for M29F400BT:
        * 16    0x7c000         0x7ffff         TOP
@@ -246,5 +213,5 @@ int write_linuxbios_m29f400bt(struct flashchip *flash, uint8_t *buf)
        printf("\n");
        //protect_m29f400bt (bios);
 
-       return (0);
+       return 0;
 }