pcmcia_get_configuration_info() disappeared
thanks to Andres Freund git-svn-id: https://dedected.org/svn/trunk@12 8d8ab74c-27aa-4a3d-9bde-523a2bc1f624
This commit is contained in:
mazzoo
parent
13b612464a
commit
2fd6dceab9
|
|
@ -507,68 +507,72 @@ static int com_on_air_probe (struct pcmcia_device *link)
|
|||
goto probe_out_1;
|
||||
}
|
||||
|
||||
ret = pcmcia_get_configuration_info(link, &(dev->config));
|
||||
if (ret == 0)
|
||||
{
|
||||
printk("com_on_air_cs: %svalid client.\n",
|
||||
(dev->config.Attributes & CONF_VALID_CLIENT) ? "":"in");
|
||||
printk("com_on_air_cs: type 0x%x\n",
|
||||
link->socket->state);
|
||||
printk("com_on_air_cs: function 0x%x\n",
|
||||
dev->config.Function);
|
||||
printk("com_on_air_cs: Attributes %d\n",
|
||||
dev->config.Attributes);
|
||||
printk("com_on_air_cs: Vcc %d\n",
|
||||
dev->config.Vcc);
|
||||
printk("com_on_air_cs: Vpp1 %d\n",
|
||||
dev->config.Vpp1);
|
||||
printk("com_on_air_cs: Vpp2 %d\n",
|
||||
dev->config.Vpp2);
|
||||
printk("com_on_air_cs: IntType %d\n",
|
||||
dev->config.IntType);
|
||||
printk("com_on_air_cs: ConfigBase 0x%x\n",
|
||||
dev->config.ConfigBase);
|
||||
printk("com_on_air_cs: Status %u, "
|
||||
"Pin %u, "
|
||||
"Copy %u, "
|
||||
"Option %u, "
|
||||
"ExtStatus %u\n",
|
||||
dev->config.Status,
|
||||
dev->config.Pin,
|
||||
dev->config.Copy,
|
||||
dev->config.Option,
|
||||
dev->config.ExtStatus);
|
||||
printk("com_on_air_cs: Present %d\n",
|
||||
dev->config.Present);
|
||||
printk("com_on_air_cs: CardValues 0x%x\n",
|
||||
dev->config.CardValues);
|
||||
printk("com_on_air_cs: AssignedIRQ 0x%x\n",
|
||||
dev->config.AssignedIRQ);
|
||||
printk("com_on_air_cs: IRQAttributes 0x%x\n",
|
||||
dev->config.IRQAttributes);
|
||||
printk("com_on_air_cs: BasePort1 0x%x\n",
|
||||
dev->config.BasePort1);
|
||||
printk("com_on_air_cs: NumPorts1 0x%x\n",
|
||||
dev->config.NumPorts1);
|
||||
printk("com_on_air_cs: Attributes1 0x%x\n",
|
||||
dev->config.Attributes1);
|
||||
printk("com_on_air_cs: BasePort2 0x%x\n",
|
||||
dev->config.BasePort2);
|
||||
printk("com_on_air_cs: NumPorts2 0x%x\n",
|
||||
dev->config.NumPorts2);
|
||||
printk("com_on_air_cs: Attributes2 0x%x\n",
|
||||
dev->config.Attributes2);
|
||||
printk("com_on_air_cs: IOAddrLines 0x%x\n",
|
||||
dev->config.IOAddrLines);
|
||||
printk("com_on_air_cs: has%s function_config\n",
|
||||
(link->function_config) ? "":" no");
|
||||
} else {
|
||||
printk("com_on_air_cs: pcmcia_get_configuration_info() "
|
||||
"failed\n");
|
||||
goto probe_out_0;
|
||||
}
|
||||
printk("com_on_air_cs: %svalid client.\n",
|
||||
(link->conf.Attributes & CONF_VALID_CLIENT) ? "":"in");
|
||||
printk("com_on_air_cs: type 0x%x\n",
|
||||
link->socket->state);
|
||||
|
||||
set_device_configbase(dev->config.ConfigBase);
|
||||
printk("com_on_air_cs: function 0x%x\n",
|
||||
link->func);
|
||||
|
||||
|
||||
printk("com_on_air_cs: Attributes %d\n",
|
||||
link->conf.Attributes);
|
||||
/*
|
||||
* I found no really easy/sensible source for those on newer kernels -
|
||||
* and they dont seem to be that interesting anyway
|
||||
printk("com_on_air_cs: Vcc %d\n",
|
||||
link->conf.Vcc);
|
||||
|
||||
printk("com_on_air_cs: Vpp1 %d\n",
|
||||
link->conf.Vpp1);
|
||||
printk("com_on_air_cs: Vpp2 %d\n",
|
||||
link->conf.Vpp2);
|
||||
*/
|
||||
|
||||
printk("com_on_air_cs: IntType %d\n",
|
||||
link->conf.IntType);
|
||||
|
||||
printk("com_on_air_cs: ConfigBase 0x%x\n",
|
||||
link->conf.ConfigBase);
|
||||
|
||||
printk("com_on_air_cs: Status %u, "
|
||||
"Pin %u, "
|
||||
"Copy %u, "
|
||||
"ExtStatus %u\n",
|
||||
link->conf.Status,
|
||||
link->conf.Pin,
|
||||
link->conf.Copy,
|
||||
link->conf.ExtStatus);
|
||||
|
||||
printk("com_on_air_cs: Present %d\n",
|
||||
link->conf.Present);
|
||||
|
||||
printk("com_on_air_cs: AssignedIRQ 0x%x\n",
|
||||
link->irq.AssignedIRQ);
|
||||
|
||||
printk("com_on_air_cs: IRQAttributes 0x%x\n",
|
||||
link->irq.Attributes);
|
||||
|
||||
printk("com_on_air_cs: BasePort1 0x%x\n",
|
||||
link->io.BasePort1);
|
||||
printk("com_on_air_cs: NumPorts1 0x%x\n",
|
||||
link->io.NumPorts1);
|
||||
printk("com_on_air_cs: Attributes1 0x%x\n",
|
||||
link->io.Attributes1);
|
||||
|
||||
printk("com_on_air_cs: BasePort2 0x%x\n",
|
||||
link->io.BasePort2);
|
||||
printk("com_on_air_cs: NumPorts2 0x%x\n",
|
||||
link->io.NumPorts2);
|
||||
printk("com_on_air_cs: Attributes2 0x%x\n",
|
||||
link->io.Attributes2);
|
||||
printk("com_on_air_cs: IOAddrLines 0x%x\n",
|
||||
link->io.IOAddrLines);
|
||||
printk("com_on_air_cs: has%s function_config\n",
|
||||
(link->function_config) ? "":" no");
|
||||
|
||||
set_device_configbase(link->conf.ConfigBase);
|
||||
|
||||
dev->sc14421_base = ((unsigned short*)(dev->membase[0]));
|
||||
|
||||
|
|
@ -664,7 +668,7 @@ static void com_on_air_remove(struct pcmcia_device *link)
|
|||
|
||||
static struct pcmcia_device_id com_on_air_ids[] =
|
||||
{
|
||||
/*
|
||||
/*
|
||||
* the crc32 hashes below are generated by the tool in
|
||||
* Documentation/pcmcia/devicetable.txt
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -19,11 +19,9 @@
|
|||
#include <pcmcia/cs_types.h>
|
||||
#include <pcmcia/cs.h>
|
||||
|
||||
|
||||
struct coa_info
|
||||
{
|
||||
struct pcmcia_device *p_dev;
|
||||
config_info_t config;
|
||||
int open;
|
||||
|
||||
int irq;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#ifndef SC14421_H
|
||||
#define SC14421_H
|
||||
|
||||
#include <linux/byteorder/swab.h>
|
||||
//#include <linux/swab.h>
|
||||
|
||||
#define SC14421_DIPSTOPPED 0x80
|
||||
#define SC14421_RAMBANK0 0x00
|
||||
|
|
|
|||
Loading…
Reference in New Issue