I hope this one is better
Am Mittwoch 29 August 2007 schrieb Uwe Hermann: > On Wed, Aug 29, 2007 at 03:34:19PM +0200, Markus Boas wrote: > > Index: w29ee011.c > > Please drop the above and use the generic LinuxBIOS header as per > http://linuxbios.org/Development_Guidelines#Common_License_Header > > (yes, I know, the existing files are b0rked too, I'll fix that in a > minute) > > > Drop this file completely please, the function prototype is in flash.h > already and this file is useless. > > Also, please update the README file with the newly supported chip. > Otherwise the patch looks good. > > > Thanks, Uwe.
Index: flash.h =================================================================== --- flash.h (Revision 2751) +++ flash.h (Arbeitskopie) @@ -100,7 +100,9 @@ #define WINBOND_ID 0xDA /* Winbond */ #define W_29C011 0xC1 +#define W_29EE011 0xC1 #define W_29C020C 0x45 +#define W_29C040P 0x46 #define W_39V040FA 0x34 #define W_39V040A 0x3D #define W_39V040B 0x54 @@ -228,6 +230,9 @@ extern int erase_49fl004(struct flashchip *flash); extern int write_49fl004(struct flashchip *flash, uint8_t *buf); +/* w29ee011.c */ +extern int probe_w29ee011(struct flashchip *flash); + /* sharplhf00l04.c */ extern int probe_lhf00l04(struct flashchip *flash); extern int erase_lhf00l04(struct flashchip *flash); Index: w29ee011.c =================================================================== --- w29ee011.c (Revision 0) +++ w29ee011.c (Revision 0) @@ -0,0 +1,58 @@ +/* + * This file is part of the LinuxBIOS project. + * + * Copyright (C) 2007 Markus Boas <[EMAIL PROTECTED]> + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "flash.h" + +int probe_w29ee011(struct flashchip *flash) +{ + volatile uint8_t *bios = flash->virtual_memory; + uint8_t id1, id2; + + /* Issue JEDEC Product ID Entry command */ + *(volatile uint8_t *)(bios + 0x5555) = 0xAA; + myusec_delay(10); + *(volatile uint8_t *)(bios + 0x2AAA) = 0x55; + myusec_delay(10); + *(volatile uint8_t *)(bios + 0x5555) = 0x80; + myusec_delay(10); + *(volatile uint8_t *)(bios + 0x5555) = 0xAA; + myusec_delay(10); + *(volatile uint8_t *)(bios + 0x2AAA) = 0x55; + myusec_delay(10); + *(volatile uint8_t *)(bios + 0x5555) = 0x60; + myusec_delay(10); + + /* Read product ID */ + id1 = *(volatile uint8_t *)bios; + id2 = *(volatile uint8_t *)(bios + 0x01); + + /* Issue JEDEC Product ID Exit command */ + *(volatile uint8_t *)(bios + 0x5555) = 0xAA; + myusec_delay(10); + *(volatile uint8_t *)(bios + 0x2AAA) = 0x55; + myusec_delay(10); + *(volatile uint8_t *)(bios + 0x5555) = 0xF0; + myusec_delay(10); + + printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); + if (id1 == flash->manufacture_id && id2 == flash->model_id) + return 1; + + return 0; +} Index: flashchips.c =================================================================== --- flashchips.c (Revision 2751) +++ flashchips.c (Arbeitskopie) @@ -82,6 +82,8 @@ probe_jedec, erase_chip_jedec, write_49fl004}, {"W29C011", WINBOND_ID, W_29C011, 128, 128, probe_jedec, erase_chip_jedec, write_jedec}, + {"W29EE011", WINBOND_ID, W_29C011, 128, 128, + probe_w29ee011, erase_chip_jedec, write_jedec}, {"W29C020C", WINBOND_ID, W_29C020C, 256, 128, probe_jedec, erase_chip_jedec, write_jedec}, {"W49F002U", WINBOND_ID, W_49F002U, 256, 128, Index: Makefile =================================================================== --- Makefile (Revision 2751) +++ Makefile (Arbeitskopie) @@ -24,7 +24,7 @@ am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \ 82802ab.o msys_doc.o pm49fl004.o sst49lf040.o sst49lfxxxc.o \ sst_fwhub.o layout.o lbtable.o flashchips.o flashrom.o \ - sharplhf00l04.o + sharplhf00l04.o w29ee011.o all: pciutils dep $(PROGRAM)
-- linuxbios mailing list linuxbios@linuxbios.org http://www.linuxbios.org/mailman/listinfo/linuxbios