mtd/drivers/mtd/chips cfi_cmdset_0001.c,1.122,1.123
cfi_cmdset_0002.c,1.73,1.74 cfi_cmdset_0020.c,1.5,1.6
cfi_probe.c,1.70,1.71 jedec.c,1.17,1.18 jedec_probe.c,1.27,1.28
map_absent.c,1.3,1.4 map_ram.c,1.16,1.17 map_rom.c,1.19,1.20
sharp.c,1.10,1.11
David Woodhouse
dwmw2 at infradead.org
Wed May 28 08:51:53 EDT 2003
Update of /home/cvs/mtd/drivers/mtd/chips
In directory phoenix.infradead.org:/tmp/cvs-serv30997
Modified Files:
cfi_cmdset_0001.c cfi_cmdset_0002.c cfi_cmdset_0020.c
cfi_probe.c jedec.c jedec_probe.c map_absent.c map_ram.c
map_rom.c sharp.c
Log Message:
C99 initialisers, spelling fixes
Index: cfi_cmdset_0001.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0001.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- cfi_cmdset_0001.c 27 May 2003 12:54:14 -0000 1.122
+++ cfi_cmdset_0001.c 28 May 2003 12:51:48 -0000 1.123
@@ -66,10 +66,10 @@
*/
static struct mtd_chip_driver cfi_intelext_chipdrv = {
- probe: NULL, /* Not usable directly */
- destroy: cfi_intelext_destroy,
- name: "cfi_cmdset_0001",
- module: THIS_MODULE
+ .probe = NULL, /* Not usable directly */
+ .destroy = cfi_intelext_destroy,
+ .name = "cfi_cmdset_0001",
+ .module = THIS_MODULE
};
/* #define DEBUG_LOCK_BITS */
Index: cfi_cmdset_0002.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0002.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- cfi_cmdset_0002.c 23 May 2003 12:23:27 -0000 1.73
+++ cfi_cmdset_0002.c 28 May 2003 12:51:48 -0000 1.74
@@ -48,10 +48,10 @@
static struct mtd_chip_driver cfi_amdstd_chipdrv = {
- probe: NULL, /* Not usable directly */
- destroy: cfi_amdstd_destroy,
- name: "cfi_cmdset_0002",
- module: THIS_MODULE
+ .probe = NULL, /* Not usable directly */
+ .destroy = cfi_amdstd_destroy,
+ .name = "cfi_cmdset_0002",
+ .module = THIS_MODULE
};
Index: cfi_cmdset_0020.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0020.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cfi_cmdset_0020.c 23 May 2003 12:23:27 -0000 1.5
+++ cfi_cmdset_0020.c 28 May 2003 12:51:48 -0000 1.6
@@ -54,10 +54,10 @@
static struct mtd_info *cfi_staa_setup (struct map_info *);
static struct mtd_chip_driver cfi_staa_chipdrv = {
- probe: NULL, /* Not usable directly */
- destroy: cfi_staa_destroy,
- name: "cfi_cmdset_0020",
- module: THIS_MODULE
+ .probe = NULL, /* Not usable directly */
+ .destroy = cfi_staa_destroy,
+ .name = "cfi_cmdset_0020",
+ .module = THIS_MODULE
};
/* #define DEBUG_LOCK_BITS */
Index: cfi_probe.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_probe.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- cfi_probe.c 23 May 2003 12:30:04 -0000 1.70
+++ cfi_probe.c 28 May 2003 12:51:48 -0000 1.71
@@ -304,8 +304,8 @@
#endif /* DEBUG_CFI */
static struct chip_probe cfi_chip_probe = {
- name: "CFI",
- probe_chip: cfi_probe_chip
+ .name = "CFI",
+ .probe_chip = cfi_probe_chip
};
struct mtd_info *cfi_probe(struct map_info *map)
@@ -318,9 +318,9 @@
}
static struct mtd_chip_driver cfi_chipdrv = {
- probe: cfi_probe,
- name: "cfi_probe",
- module: THIS_MODULE
+ .probe = cfi_probe,
+ .name = "cfi_probe",
+ .module = THIS_MODULE
};
int __init cfi_probe_init(void)
Index: jedec.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/jedec.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jedec.c 21 May 2003 15:15:05 -0000 1.17
+++ jedec.c 28 May 2003 12:51:48 -0000 1.18
@@ -39,14 +39,51 @@
/* Listing of parts and sizes. We need this table to learn the sector
size of the chip and the total length */
-static const struct JEDECTable JEDEC_table[] =
- {{0x013D,"AMD Am29F017D",2*1024*1024,64*1024,MTD_CAP_NORFLASH},
- {0x01AD,"AMD Am29F016",2*1024*1024,64*1024,MTD_CAP_NORFLASH},
- {0x01D5,"AMD Am29F080",1*1024*1024,64*1024,MTD_CAP_NORFLASH},
- {0x01A4,"AMD Am29F040",512*1024,64*1024,MTD_CAP_NORFLASH},
- {0x20E3,"AMD Am29W040B",512*1024,64*1024,MTD_CAP_NORFLASH},
- {0xC2AD,"Macronix MX29F016",2*1024*1024,64*1024,MTD_CAP_NORFLASH},
- {}};
+static const struct JEDECTable JEDEC_table[] = {
+ {
+ .jedec = 0x013D,
+ .name = "AMD Am29F017D",
+ .size = 2*1024*1024,
+ .sectorsize = 64*1024,
+ .capabilities = MTD_CAP_NORFLASH
+ },
+ {
+ .jedec = 0x01AD,
+ .name = "AMD Am29F016",
+ .size = 2*1024*1024,
+ .sectorsize = 64*1024,
+ .capabilities = MTD_CAP_NORFLASH
+ },
+ {
+ .jedec = 0x01D5,
+ .name = "AMD Am29F080",
+ .size = 1*1024*1024,
+ .sectorsize = 64*1024,
+ .capabilities = MTD_CAP_NORFLASH
+ },
+ {
+ .jedec = 0x01A4,
+ .name = "AMD Am29F040",
+ .size = 512*1024,
+ .sectorsize = 64*1024,
+ .capabilities = MTD_CAP_NORFLASH
+ },
+ {
+ .jedec = 0x20E3,
+ .name = "AMD Am29W040B",
+ .size = 512*1024,
+ .sectorsize = 64*1024,
+ .capabilities = MTD_CAP_NORFLASH
+ },
+ {
+ .jedec = 0xC2AD,
+ .name = "Macronix MX29F016",
+ .size = 2*1024*1024,
+ .sectorsize = 64*1024,
+ .capabilities = MTD_CAP_NORFLASH
+ },
+ { .jedec = 0x0 }
+};
static const struct JEDECTable *jedec_idtoinf(__u8 mfr,__u8 id);
static void jedec_sync(struct mtd_info *mtd) {};
@@ -60,9 +97,9 @@
static struct mtd_chip_driver jedec_chipdrv = {
- probe: jedec_probe,
- name: "jedec",
- module: THIS_MODULE
+ .probe = jedec_probe,
+ .name = "jedec",
+ .module = THIS_MODULE
};
/* Probe entry point */
@@ -614,7 +651,7 @@
/* Poll the flash for erasure completion, specs say this can take as long
as 480 seconds to do all the sectors (for a 2 meg flash).
- Erasure time is dependant on chip age, temp and wear.. */
+ Erasure time is dependent on chip age, temp and wear.. */
/* This being a generic routine assumes a 32 bit bus. It does read32s
and bundles interleved chips into the same grouping. This will work
@@ -761,8 +798,8 @@
size_t *retlen, const u_char *buf)
{
/* Does IO to the currently selected chip. It takes the bank addressing
- base (which is divisable by the chip size) adds the necesary lower bits
- of addrshift (interleve index) and then adds the control register index. */
+ base (which is divisible by the chip size) adds the necessary lower bits
+ of addrshift (interleave index) and then adds the control register index. */
#define flread(x) map_read8(map,base+(off&((1<<chip->addrshift)-1))+((x)<<chip->addrshift))
#define flwrite(v,x) map_write8(map,v,base+(off&((1<<chip->addrshift)-1))+((x)<<chip->addrshift))
Index: jedec_probe.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/jedec_probe.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jedec_probe.c 21 May 2003 15:15:05 -0000 1.27
+++ jedec_probe.c 28 May 2003 12:51:48 -0000 1.28
@@ -235,978 +235,1112 @@
*/
static const struct amd_flash_info jedec_table[] = {
{
- mfr_id: MANUFACTURER_AMD,
- dev_id: AM29F032B,
- name: "AMD AM29F032B",
- uaddr: {[0] = MTD_UADDR_0x0555_0x02AA}, /* x8 */
- DevSize: SIZE_4MiB,
- CmdSet: P_ID_AMD_STD,
- NumEraseRegions: 1,
- regions: {ERASEINFO(0x10000,64)
[...1820 lines suppressed...]
+ ERASEINFO(0x02000,8)
+ }
+ }, {
+ .mfr_id = MANUFACTURER_WINBOND,
+ .dev_id = W49V002A,
+ .name = "Winbond W49V002A",
+ .uaddr = {
+ [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
+ },
+ .DevSize = SIZE_256KiB,
+ .CmdSet = P_ID_AMD_STD,
+ .NumEraseRegions= 4,
+ .regions = {
+ ERASEINFO(0x10000, 3),
+ ERASEINFO(0x08000, 1),
+ ERASEINFO(0x02000, 2),
+ ERASEINFO(0x04000, 1),
}
}
};
Index: map_absent.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/map_absent.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- map_absent.c 21 May 2003 15:15:05 -0000 1.3
+++ map_absent.c 28 May 2003 12:51:49 -0000 1.4
@@ -37,10 +37,10 @@
static struct mtd_chip_driver map_absent_chipdrv = {
- probe: map_absent_probe,
- destroy: map_absent_destroy,
- name: "map_absent",
- module: THIS_MODULE
+ .probe = map_absent_probe,
+ .destroy = map_absent_destroy,
+ .name = "map_absent",
+ .module = THIS_MODULE
};
static struct mtd_info *map_absent_probe(struct map_info *map)
Index: map_ram.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/map_ram.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- map_ram.c 21 May 2003 15:15:05 -0000 1.16
+++ map_ram.c 28 May 2003 12:51:49 -0000 1.17
@@ -25,9 +25,9 @@
static struct mtd_chip_driver mapram_chipdrv = {
- probe: map_ram_probe,
- name: "map_ram",
- module: THIS_MODULE
+ .probe = map_ram_probe,
+ .name = "map_ram",
+ .module = THIS_MODULE
};
static struct mtd_info *map_ram_probe(struct map_info *map)
Index: map_rom.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/map_rom.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- map_rom.c 21 May 2003 15:15:05 -0000 1.19
+++ map_rom.c 28 May 2003 12:51:49 -0000 1.20
@@ -23,9 +23,9 @@
struct mtd_info *map_rom_probe(struct map_info *map);
static struct mtd_chip_driver maprom_chipdrv = {
- probe: map_rom_probe,
- name: "map_rom",
- module: THIS_MODULE
+ .probe = map_rom_probe,
+ .name = "map_rom",
+ .module = THIS_MODULE
};
struct mtd_info *map_rom_probe(struct map_info *map)
Index: sharp.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/sharp.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sharp.c 14 May 2003 15:05:13 -0000 1.10
+++ sharp.c 28 May 2003 12:51:49 -0000 1.11
@@ -98,10 +98,10 @@
static void sharp_destroy(struct mtd_info *mtd);
static struct mtd_chip_driver sharp_chipdrv = {
- probe: sharp_probe,
- destroy: sharp_destroy,
- name: "sharp",
- module: THIS_MODULE
+ .probe = sharp_probe,
+ .destroy = sharp_destroy,
+ .name = "sharp",
+ .module = THIS_MODULE
};
More information about the linux-mtd-cvs
mailing list