Commit f6763c98 authored by Alexander Kurz's avatar Alexander Kurz Committed by David Woodhouse
Browse files

pcmciamtd: fixing obvious errors 



After fixing the obvious errors, the driver will now compile
again on v2.6.34-rc3. First tests with two 4MB flash cards including
erase- and write test with one of the cards where successful.

Also, add two new PCMCIA_DEVICE_PROD_IDs.

[linux@dominikbrodowski.net: clean up commit message]
Signed-off-by: default avatarAlexander Kurz <linux@kbdbabel.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 087acaf1

drivers/mtd/maps/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ config MTD_PCI 


config MTD_PCMCIA

	tristate "PCMCIA MTD driver"

	depends on PCMCIA && MTD_COMPLEX_MAPPINGS && BROKEN

	depends on PCMCIA && MTD_COMPLEX_MAPPINGS

	help

	  Map driver for accessing PCMCIA linear flash memory cards. These

	  cards are usually around 4-16MiB in size. This does not include

drivers/mtd/maps/pcmciamtd.c

+16 −16
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static map_word pcmcia_read8_remap(struct map_info *map, unsigned long ofs) 
		return d;



	d.x[0] = readb(addr);

	DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%02x", ofs, addr, d.x[0]);

	DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%02lx", ofs, addr, d.x[0]);

	return d;

}
@@ -152,7 +152,7 @@ static map_word pcmcia_read16_remap(struct map_info *map, unsigned long ofs) 
		return d;



	d.x[0] = readw(addr);

	DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%04x", ofs, addr, d.x[0]);

	DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%04lx", ofs, addr, d.x[0]);

	return d;

}
@@ -190,7 +190,7 @@ static void pcmcia_write8_remap(struct map_info *map, map_word d, unsigned long 
	if(!addr)

		return;



	DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%02x", adr, addr, d.x[0]);

	DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%02lx", adr, addr, d.x[0]);

	writeb(d.x[0], addr);

}
@@ -201,7 +201,7 @@ static void pcmcia_write16_remap(struct map_info *map, map_word d, unsigned long 
	if(!addr)

		return;



	DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%04x", adr, addr, d.x[0]);

	DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%04lx", adr, addr, d.x[0]);

	writew(d.x[0], addr);

}
@@ -245,7 +245,7 @@ static map_word pcmcia_read8(struct map_info *map, unsigned long ofs) 
		return d;



	d.x[0] = readb(win_base + ofs);

	DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%02x", ofs, win_base + ofs, d.x[0]);

	DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%02lx", ofs, win_base + ofs, d.x[0]);

	return d;

}
@@ -259,7 +259,7 @@ static map_word pcmcia_read16(struct map_info *map, unsigned long ofs) 
		return d;



	d.x[0] = readw(win_base + ofs);

	DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%04x", ofs, win_base + ofs, d.x[0]);

	DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%04lx", ofs, win_base + ofs, d.x[0]);

	return d;

}
@@ -276,27 +276,27 @@ static void pcmcia_copy_from(struct map_info *map, void *to, unsigned long from, 
}





static void pcmcia_write8(struct map_info *map, u8 d, unsigned long adr)

static void pcmcia_write8(struct map_info *map, map_word d, unsigned long adr)

{

	caddr_t win_base = (caddr_t)map->map_priv_2;



	if(DEV_REMOVED(map))

		return;



	DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%02x", adr, win_base + adr, d);

	writeb(d, win_base + adr);

	DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%02lx", adr, win_base + adr, d.x[0]);

	writeb(d.x[0], win_base + adr);

}





static void pcmcia_write16(struct map_info *map, u16 d, unsigned long adr)

static void pcmcia_write16(struct map_info *map, map_word d, unsigned long adr)

{

	caddr_t win_base = (caddr_t)map->map_priv_2;



	if(DEV_REMOVED(map))

		return;



	DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%04x", adr, win_base + adr, d);

	writew(d, win_base + adr);

	DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%04lx", adr, win_base + adr, d.x[0]);

	writew(d.x[0], win_base + adr);

}
@@ -432,7 +432,7 @@ static int pcmciamtd_cistpl_geo(struct pcmcia_device *p_dev, 
}





static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link, int *new_name)

static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *p_dev, int *new_name)

{

	int i;
@@ -490,7 +490,6 @@ static int pcmciamtd_config(struct pcmcia_device *link) 
{

	struct pcmciamtd_dev *dev = link->priv;

	struct mtd_info *mtd = NULL;

	cs_status_t status;

	win_req_t req;

	int ret;

	int i;
@@ -565,7 +564,7 @@ static int pcmciamtd_config(struct pcmcia_device *link) 
	dev->pcmcia_map.map_priv_1 = (unsigned long)dev;

	dev->pcmcia_map.map_priv_2 = (unsigned long)link->win;



	dev->vpp = (vpp) ? vpp : link->socket.socket.Vpp;

	dev->vpp = (vpp) ? vpp : link->socket->socket.Vpp;

	link->conf.Attributes = 0;

	if(setvpp == 2) {

		link->conf.Vpp = dev->vpp;
@@ -652,7 +651,6 @@ static int pcmciamtd_config(struct pcmcia_device *link) 
	link->dev_node = &dev->node;

	return 0;



 failed:

	err("CS Error, exiting");

	pcmciamtd_release(link);

	return -ENODEV;
@@ -737,8 +735,10 @@ static struct pcmcia_device_id pcmciamtd_ids[] = { 
	PCMCIA_DEVICE_PROD_ID12("intel", "VALUE SERIES 100 ", 0x40ade711, 0xdf8506d8),

	PCMCIA_DEVICE_PROD_ID12("KINGMAX TECHNOLOGY INC.", "SRAM 256K Bytes", 0x54d0c69c, 0xad12c29c),

	PCMCIA_DEVICE_PROD_ID12("Maxtor", "MAXFL MobileMax Flash Memory Card", 0xb68968c8, 0x2dfb47b0),

	PCMCIA_DEVICE_PROD_ID123("M-Systems", "M-SYS Flash Memory Card", "(c) M-Systems", 0x7ed2ad87, 0x675dc3fb, 0x7aef3965),

	PCMCIA_DEVICE_PROD_ID12("SEIKO EPSON", "WWB101EN20", 0xf9876baf, 0xad0b207b),

	PCMCIA_DEVICE_PROD_ID12("SEIKO EPSON", "WWB513EN20", 0xf9876baf, 0xe8d884ad),

	PCMCIA_DEVICE_PROD_ID12("SMART Modular Technologies", " 4MB FLASH Card", 0x96fd8277, 0x737a5b05),

	PCMCIA_DEVICE_PROD_ID12("Starfish, Inc.", "REX-3000", 0x05ddca47, 0xe7d67bca),

	PCMCIA_DEVICE_PROD_ID12("Starfish, Inc.", "REX-4100", 0x05ddca47, 0x7bc32944),

	/* the following was commented out in pcmcia-cs-3.2.7 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE