mtd/drivers/mtd/chips amd_flash.c,1.20,1.21
cfi_cmdset_0001.c,1.116,1.117 cfi_cmdset_0002.c,1.69,1.70
cfi_cmdset_0020.c,1.1,1.2 jedec.c,1.14,1.15 map_ram.c,1.14,1.15
map_rom.c,1.17,1.18 sharp.c,1.9,1.10
David Woodhouse
dwmw2 at infradead.org
Wed May 14 11:05:46 EDT 2003
Update of /home/cvs/mtd/drivers/mtd/chips
In directory phoenix.infradead.org:/tmp/cvs-serv26387/drivers/mtd/chips
Modified Files:
amd_flash.c cfi_cmdset_0001.c cfi_cmdset_0002.c
cfi_cmdset_0020.c jedec.c map_ram.c map_rom.c sharp.c
Log Message:
Make support for non-linear mappings conditional
Index: amd_flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/amd_flash.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- amd_flash.c 14 Mar 2003 18:31:47 -0000 1.20
+++ amd_flash.c 14 May 2003 15:05:12 -0000 1.21
@@ -140,11 +140,11 @@
static inline __u32 wide_read(struct map_info *map, __u32 addr)
{
if (map->buswidth == 1) {
- return map->read8(map, addr);
+ return map_read8(map, addr);
} else if (map->buswidth == 2) {
- return map->read16(map, addr);
+ return map_read16(map, addr);
} else if (map->buswidth == 4) {
- return map->read32(map, addr);
+ return map_read32(map, addr);
}
return 0;
@@ -153,11 +153,11 @@
static inline void wide_write(struct map_info *map, __u32 val, __u32 addr)
{
if (map->buswidth == 1) {
- map->write8(map, val, addr);
+ map_write8(map, val, addr);
} else if (map->buswidth == 2) {
- map->write16(map, val, addr);
+ map_write16(map, val, addr);
} else if (map->buswidth == 4) {
- map->write32(map, val, addr);
+ map_write32(map, val, addr);
}
}
@@ -819,7 +819,7 @@
chip->state = FL_READY;
- map->copy_from(map, buf, adr, len);
+ map_copy_from(map, buf, adr, len);
wake_up(&chip->wq);
spin_unlock_bh(chip->mutex);
@@ -981,7 +981,7 @@
u_char tmp_buf[4];
__u32 datum;
- map->copy_from(map, tmp_buf,
+ map_copy_from(map, tmp_buf,
bus_ofs + private->chips[chipnum].start,
map->buswidth);
while (len && i < map->buswidth)
@@ -1054,7 +1054,7 @@
u_char tmp_buf[2];
__u32 datum;
- map->copy_from(map, tmp_buf,
+ map_copy_from(map, tmp_buf,
ofs + private->chips[chipnum].start,
map->buswidth);
while (len--) {
@@ -1175,7 +1175,7 @@
__u8 verify;
for (address = adr; address < (adr + size); address++) {
- if ((verify = map->read8(map, address)) != 0xFF) {
+ if ((verify = map_read8(map, address)) != 0xFF) {
error = 1;
break;
}
Index: cfi_cmdset_0001.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0001.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- cfi_cmdset_0001.c 28 Apr 2003 15:16:21 -0000 1.116
+++ cfi_cmdset_0001.c 14 May 2003 15:05:12 -0000 1.117
@@ -267,7 +267,7 @@
mtd->erase = cfi_intelext_erase_varsize;
mtd->read = cfi_intelext_read;
- if(map->point && map->unpoint){
+ if (map_is_linear(map)) {
mtd->point = cfi_intelext_point;
mtd->unpoint = cfi_intelext_unpoint;
}
@@ -476,7 +476,7 @@
if (from + len > mtd->size)
return -EINVAL;
- *mtdbuf = map->point(map, from, len);
+ *mtdbuf = (void *)map->virt + from;
if(*mtdbuf == NULL)
return -EINVAL; /* can not point this region */
*retlen = 0;
@@ -518,7 +518,6 @@
unsigned long ofs;
int chipnum;
- map->unpoint(map, addr, from, len);
/* Now unlock the chip(s) POINT state */
/* ofs: offset within the first chip that the first read should start */
@@ -579,7 +578,7 @@
chip->state = FL_READY;
}
- map->copy_from(map, buf, adr, len);
+ map_copy_from(map, buf, adr, len);
put_chip(map, chip, cmd_addr);
@@ -661,7 +660,7 @@
}
while (count && ((offst-base_offst) < reg_sz)) {
- *buf = map->read8(map,(chip->start+((extp->ProtRegAddr+1)*ofs_factor)+offst));
+ *buf = map_read8(map,(chip->start+((extp->ProtRegAddr+1)*ofs_factor)+offst));
buf++;
offst++;
count--;
@@ -999,13 +998,13 @@
/* Write data */
for (z = 0; z < len; z += CFIDEV_BUSWIDTH) {
if (cfi_buswidth_is_1()) {
- map->write8 (map, *((__u8*)buf)++, adr+z);
+ map_write8 (map, *((__u8*)buf)++, adr+z);
} else if (cfi_buswidth_is_2()) {
- map->write16 (map, *((__u16*)buf)++, adr+z);
+ map_write16 (map, *((__u16*)buf)++, adr+z);
} else if (cfi_buswidth_is_4()) {
- map->write32 (map, *((__u32*)buf)++, adr+z);
+ map_write32 (map, *((__u32*)buf)++, adr+z);
} else if (cfi_buswidth_is_8()) {
- map->write64 (map, *((__u64*)buf)++, adr+z);
+ map_write64 (map, *((__u64*)buf)++, adr+z);
} else {
ret = -EINVAL;
goto out;
Index: cfi_cmdset_0002.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0002.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- cfi_cmdset_0002.c 6 May 2003 21:34:40 -0000 1.69
+++ cfi_cmdset_0002.c 14 May 2003 15:05:12 -0000 1.70
@@ -318,7 +318,7 @@
chip->state = FL_READY;
- map->copy_from(map, buf, adr, len);
+ map_copy_from(map, buf, adr, len);
wake_up(&chip->wq);
cfi_spin_unlock(chip->mutex);
@@ -404,7 +404,7 @@
cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
cfi_send_gen_cmd(0x88, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
- map->copy_from(map, buf, adr, len);
+ map_copy_from(map, buf, adr, len);
cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
@@ -686,7 +686,7 @@
u_char tmp_buf[8];
cfi_word datum;
- map->copy_from(map, tmp_buf, bus_ofs + cfi->chips[chipnum].start, CFIDEV_BUSWIDTH);
+ map_copy_from(map, tmp_buf, bus_ofs + cfi->chips[chipnum].start, CFIDEV_BUSWIDTH);
while (len && i < CFIDEV_BUSWIDTH)
tmp_buf[i++] = buf[n++], len--;
@@ -784,7 +784,7 @@
u_char tmp_buf[8];
cfi_word datum;
- map->copy_from(map, tmp_buf, ofs + cfi->chips[chipnum].start, CFIDEV_BUSWIDTH);
+ map_copy_from(map, tmp_buf, ofs + cfi->chips[chipnum].start, CFIDEV_BUSWIDTH);
while (len--)
tmp_buf[i++] = buf[n++];
Index: cfi_cmdset_0020.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0020.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cfi_cmdset_0020.c 3 Sep 2002 13:30:43 -0000 1.1
+++ cfi_cmdset_0020.c 14 May 2003 15:05:13 -0000 1.2
@@ -374,7 +374,7 @@
goto retry;
}
- map->copy_from(map, buf, adr, len);
+ map_copy_from(map, buf, adr, len);
if (suspended) {
chip->state = chip->oldstate;
@@ -540,11 +540,11 @@
/* Write data */
for (z = 0; z < len; z += CFIDEV_BUSWIDTH) {
if (cfi_buswidth_is_1()) {
- map->write8 (map, *((__u8*)buf)++, adr+z);
+ map_write8 (map, *((__u8*)buf)++, adr+z);
} else if (cfi_buswidth_is_2()) {
- map->write16 (map, *((__u16*)buf)++, adr+z);
+ map_write16 (map, *((__u16*)buf)++, adr+z);
} else if (cfi_buswidth_is_4()) {
- map->write32 (map, *((__u32*)buf)++, adr+z);
+ map_write32 (map, *((__u32*)buf)++, adr+z);
} else {
DISABLE_VPP(map);
return -EINVAL;
Index: jedec.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/jedec.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jedec.c 27 Jun 2002 02:19:12 -0000 1.14
+++ jedec.c 14 May 2003 15:05:13 -0000 1.15
@@ -351,8 +351,8 @@
static int jedec_probe8(struct map_info *map,unsigned long base,
struct jedec_private *priv)
{
- #define flread(x) map->read8(map,base+x)
- #define flwrite(v,x) map->write8(map,v,base+x)
+ #define flread(x) map_read8(map,base+x)
+ #define flwrite(v,x) map_write8(map,v,base+x)
const unsigned long AutoSel1 = 0xAA;
const unsigned long AutoSel2 = 0x55;
@@ -411,8 +411,8 @@
static int jedec_probe32(struct map_info *map,unsigned long base,
struct jedec_private *priv)
{
- #define flread(x) map->read32(map,base+((x)<<2))
- #define flwrite(v,x) map->write32(map,v,base+((x)<<2))
+ #define flread(x) map_read32(map,base+((x)<<2))
+ #define flwrite(v,x) map_write32(map,v,base+((x)<<2))
const unsigned long AutoSel1 = 0xAAAAAAAA;
const unsigned long AutoSel2 = 0x55555555;
@@ -490,7 +490,7 @@
{
struct map_info *map = (struct map_info *)mtd->priv;
- map->copy_from(map, buf, from, len);
+ map_copy_from(map, buf, from, len);
*retlen = len;
return 0;
}
@@ -514,7 +514,7 @@
get = priv->bank_fill[0] - offset;
bank /= priv->bank_fill[0];
- map->copy_from(map,buf + *retlen,bank*my_bank_size + offset,get);
+ map_copy_from(map,buf + *retlen,bank*my_bank_size + offset,get);
len -= get;
*retlen += get;
@@ -545,8 +545,8 @@
static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
{
// Does IO to the currently selected chip
- #define flread(x) map->read8(map,chip->base+((x)<<chip->addrshift))
- #define flwrite(v,x) map->write8(map,v,chip->base+((x)<<chip->addrshift))
+ #define flread(x) map_read8(map,chip->base+((x)<<chip->addrshift))
+ #define flwrite(v,x) map_write8(map,v,chip->base+((x)<<chip->addrshift))
unsigned long Time = 0;
unsigned long NoTime = 0;
@@ -651,19 +651,19 @@
or this is not really flash ;> */
switch (map->buswidth) {
case 1:
- Last[0] = map->read8(map,(chip->base >> chip->addrshift) + chip->start + off);
- Last[1] = map->read8(map,(chip->base >> chip->addrshift) + chip->start + off);
- Last[2] = map->read8(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[0] = map_read8(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[1] = map_read8(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[2] = map_read8(map,(chip->base >> chip->addrshift) + chip->start + off);
break;
case 2:
- Last[0] = map->read16(map,(chip->base >> chip->addrshift) + chip->start + off);
- Last[1] = map->read16(map,(chip->base >> chip->addrshift) + chip->start + off);
- Last[2] = map->read16(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[0] = map_read16(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[1] = map_read16(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[2] = map_read16(map,(chip->base >> chip->addrshift) + chip->start + off);
break;
case 3:
- Last[0] = map->read32(map,(chip->base >> chip->addrshift) + chip->start + off);
- Last[1] = map->read32(map,(chip->base >> chip->addrshift) + chip->start + off);
- Last[2] = map->read32(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[0] = map_read32(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[1] = map_read32(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[2] = map_read32(map,(chip->base >> chip->addrshift) + chip->start + off);
break;
}
Count = 3;
@@ -699,13 +699,13 @@
switch (map->buswidth) {
case 1:
- Last[Count % 4] = map->read8(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[Count % 4] = map_read8(map,(chip->base >> chip->addrshift) + chip->start + off);
break;
case 2:
- Last[Count % 4] = map->read16(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[Count % 4] = map_read16(map,(chip->base >> chip->addrshift) + chip->start + off);
break;
case 4:
- Last[Count % 4] = map->read32(map,(chip->base >> chip->addrshift) + chip->start + off);
+ Last[Count % 4] = map_read32(map,(chip->base >> chip->addrshift) + chip->start + off);
break;
}
Count++;
@@ -757,8 +757,8 @@
/* 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. */
- #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))
+ #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))
struct map_info *map = (struct map_info *)mtd->priv;
struct jedec_private *priv = (struct jedec_private *)map->fldrv_priv;
@@ -794,7 +794,7 @@
// Loop over this page
for (; off != (chip->size << chip->addrshift) && len != 0; start++, len--, off++,buf++)
{
- unsigned char oldbyte = map->read8(map,base+off);
+ unsigned char oldbyte = map_read8(map,base+off);
unsigned char Last[4];
unsigned long Count = 0;
@@ -809,10 +809,10 @@
flwrite(0xAA,0x555);
flwrite(0x55,0x2AA);
flwrite(0xA0,0x555);
- map->write8(map,*buf,base + off);
- Last[0] = map->read8(map,base + off);
- Last[1] = map->read8(map,base + off);
- Last[2] = map->read8(map,base + off);
+ map_write8(map,*buf,base + off);
+ Last[0] = map_read8(map,base + off);
+ Last[1] = map_read8(map,base + off);
+ Last[2] = map_read8(map,base + off);
/* Wait for the flash to finish the operation. We store the last 4
status bytes that have been retrieved so we can determine why
@@ -820,7 +820,7 @@
failure */
for (Count = 3; Last[(Count - 1) % 4] != Last[(Count - 2) % 4] &&
Count < 10000; Count++)
- Last[Count % 4] = map->read8(map,base + off);
+ Last[Count % 4] = map_read8(map,base + off);
if (Last[(Count - 1) % 4] != *buf)
{
jedec_flash_failed(Last[(Count - 3) % 4]);
Index: map_ram.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/map_ram.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- map_ram.c 2 Oct 2001 15:05:12 -0000 1.14
+++ map_ram.c 14 May 2003 15:05:13 -0000 1.15
@@ -34,21 +34,21 @@
/* Check the first byte is RAM */
#if 0
- map->write8(map, 0x55, 0);
- if (map->read8(map, 0) != 0x55)
+ map_write8(map, 0x55, 0);
+ if (map_read8(map, 0) != 0x55)
return NULL;
- map->write8(map, 0xAA, 0);
- if (map->read8(map, 0) != 0xAA)
+ map_write8(map, 0xAA, 0);
+ if (map_read8(map, 0) != 0xAA)
return NULL;
/* Check the last byte is RAM */
- map->write8(map, 0x55, map->size-1);
- if (map->read8(map, map->size-1) != 0x55)
+ map_write8(map, 0x55, map->size-1);
+ if (map_read8(map, map->size-1) != 0x55)
return NULL;
- map->write8(map, 0xAA, map->size-1);
- if (map->read8(map, map->size-1) != 0xAA)
+ map_write8(map, 0xAA, map->size-1);
+ if (map_read8(map, map->size-1) != 0xAA)
return NULL;
#endif
/* OK. It seems to be RAM. */
@@ -83,7 +83,7 @@
{
struct map_info *map = (struct map_info *)mtd->priv;
- map->copy_from(map, buf, from, len);
+ map_copy_from(map, buf, from, len);
*retlen = len;
return 0;
}
@@ -92,7 +92,7 @@
{
struct map_info *map = (struct map_info *)mtd->priv;
- map->copy_to(map, to, buf, len);
+ map_copy_to(map, to, buf, len);
*retlen = len;
return 0;
}
@@ -105,7 +105,7 @@
unsigned long i;
for (i=0; i<instr->len; i++)
- map->write8(map, 0xFF, instr->addr + i);
+ map_write8(map, 0xFF, instr->addr + i);
if (instr->callback)
instr->callback(instr);
Index: map_rom.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/map_rom.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- map_rom.c 2 Oct 2001 15:05:12 -0000 1.17
+++ map_rom.c 14 May 2003 15:05:13 -0000 1.18
@@ -58,7 +58,7 @@
{
struct map_info *map = (struct map_info *)mtd->priv;
- map->copy_from(map, buf, from, len);
+ map_copy_from(map, buf, from, len);
*retlen = len;
return 0;
}
Index: sharp.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/sharp.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sharp.c 13 Feb 2003 21:12:30 -0000 1.9
+++ sharp.c 14 May 2003 15:05:13 -0000 1.10
@@ -165,12 +165,12 @@
u32 read0, read4;
int width = 4;
- tmp = map->read32(map, base+0);
+ tmp = map_read32(map, base+0);
- map->write32(map, CMD_READ_ID, base+0);
+ map_write32(map, CMD_READ_ID, base+0);
- read0=map->read32(map, base+0);
- read4=map->read32(map, base+4);
+ read0=map_read32(map, base+0);
+ read4=map_read32(map, base+4);
if(read0 == 0x89898989){
printk("Looks like sharp flash\n");
switch(read4){
@@ -198,10 +198,10 @@
printk("Sort-of looks like sharp flash, 0x%08x 0x%08x\n",
read0,read4);
}
- }else if((map->read32(map, base+0) == CMD_READ_ID)){
+ }else if((map_read32(map, base+0) == CMD_READ_ID)){
/* RAM, probably */
printk("Looks like RAM\n");
- map->write32(map, tmp, base+0);
+ map_write32(map, tmp, base+0);
}else{
printk("Doesn't look like sharp flash, 0x%08x 0x%08x\n",
read0,read4);
@@ -223,10 +223,10 @@
switch(chip->state){
case FL_READY:
- map->write32(map,CMD_READ_STATUS,adr);
+ map_write32(map,CMD_READ_STATUS,adr);
chip->state = FL_STATUS;
case FL_STATUS:
- status = map->read32(map,adr);
+ status = map_read32(map,adr);
//printk("status=%08x\n",status);
udelay(100);
@@ -254,7 +254,7 @@
goto retry;
}
- map->write32(map,CMD_RESET, adr);
+ map_write32(map,CMD_RESET, adr);
chip->state = FL_READY;
@@ -295,7 +295,7 @@
if(ret<0)
break;
- map->copy_from(map,buf,ofs,thislen);
+ map_copy_from(map,buf,ofs,thislen);
sharp_release(&sharp->chips[chipnum]);
@@ -356,17 +356,17 @@
ret = sharp_wait(map,chip);
for(try=0;try<10;try++){
- map->write32(map,CMD_BYTE_WRITE,adr);
+ map_write32(map,CMD_BYTE_WRITE,adr);
/* cpu_to_le32 -> hack to fix the writel be->le conversion */
- map->write32(map,cpu_to_le32(datum),adr);
+ map_write32(map,cpu_to_le32(datum),adr);
chip->state = FL_WRITING;
timeo = jiffies + (HZ/2);
- map->write32(map,CMD_READ_STATUS,adr);
+ map_write32(map,CMD_READ_STATUS,adr);
for(i=0;i<100;i++){
- status = map->read32(map,adr);
+ status = map_read32(map,adr);
if((status & SR_READY)==SR_READY)
break;
}
@@ -379,9 +379,9 @@
printk("sharp: error writing byte at addr=%08lx status=%08x\n",adr,status);
- map->write32(map,CMD_CLEAR_STATUS,adr);
+ map_write32(map,CMD_CLEAR_STATUS,adr);
}
- map->write32(map,CMD_RESET,adr);
+ map_write32(map,CMD_RESET,adr);
chip->state = FL_READY;
wake_up(&chip->wq);
@@ -438,14 +438,14 @@
int status;
DECLARE_WAITQUEUE(wait, current);
- map->write32(map,CMD_READ_STATUS,adr);
- status = map->read32(map,adr);
+ map_write32(map,CMD_READ_STATUS,adr);
+ status = map_read32(map,adr);
timeo = jiffies + HZ;
while(time_before(jiffies, timeo)){
- map->write32(map,CMD_READ_STATUS,adr);
- status = map->read32(map,adr);
+ map_write32(map,CMD_READ_STATUS,adr);
+ status = map_read32(map,adr);
if((status & SR_READY)==SR_READY){
ret = 0;
goto out;
@@ -487,26 +487,26 @@
sharp_unlock_oneblock(map,chip,adr);
#endif
- map->write32(map,CMD_BLOCK_ERASE_1,adr);
- map->write32(map,CMD_BLOCK_ERASE_2,adr);
+ map_write32(map,CMD_BLOCK_ERASE_1,adr);
+ map_write32(map,CMD_BLOCK_ERASE_2,adr);
chip->state = FL_ERASING;
ret = sharp_do_wait_for_ready(map,chip,adr);
if(ret<0)return ret;
- map->write32(map,CMD_READ_STATUS,adr);
- status = map->read32(map,adr);
+ map_write32(map,CMD_READ_STATUS,adr);
+ status = map_read32(map,adr);
if(!(status&SR_ERRORS)){
- map->write32(map,CMD_RESET,adr);
+ map_write32(map,CMD_RESET,adr);
chip->state = FL_READY;
//spin_unlock_bh(chip->mutex);
return 0;
}
printk("sharp: error erasing block at addr=%08lx status=%08x\n",adr,status);
- map->write32(map,CMD_CLEAR_STATUS,adr);
+ map_write32(map,CMD_CLEAR_STATUS,adr);
//spin_unlock_bh(chip->mutex);
@@ -520,17 +520,17 @@
int i;
int status;
- map->write32(map,CMD_CLEAR_BLOCK_LOCKS_1,adr);
- map->write32(map,CMD_CLEAR_BLOCK_LOCKS_2,adr);
+ map_write32(map,CMD_CLEAR_BLOCK_LOCKS_1,adr);
+ map_write32(map,CMD_CLEAR_BLOCK_LOCKS_2,adr);
udelay(100);
- status = map->read32(map,adr);
+ status = map_read32(map,adr);
printk("status=%08x\n",status);
for(i=0;i<1000;i++){
- //map->write32(map,CMD_READ_STATUS,adr);
- status = map->read32(map,adr);
+ //map_write32(map,CMD_READ_STATUS,adr);
+ status = map_read32(map,adr);
if((status & SR_READY)==SR_READY)
break;
udelay(100);
@@ -540,13 +540,13 @@
}
if(!(status&SR_ERRORS)){
- map->write32(map,CMD_RESET,adr);
+ map_write32(map,CMD_RESET,adr);
chip->state = FL_READY;
return;
}
printk("sharp: error unlocking block at addr=%08lx status=%08x\n",adr,status);
- map->write32(map,CMD_CLEAR_STATUS,adr);
+ map_write32(map,CMD_CLEAR_STATUS,adr);
}
#endif
More information about the linux-mtd-cvs
mailing list