#define FORCE_EPP_MODE 0x08
typedef struct parport_info_t {
- struct pcmcia_device *p_dev;
+ dev_link_t link;
int ndev;
dev_node_t node;
struct parport *port;
} parport_info_t;
static void parport_detach(struct pcmcia_device *p_dev);
-static int parport_config(struct pcmcia_device *link);
-static void parport_cs_release(struct pcmcia_device *);
+static void parport_config(dev_link_t *link);
+static void parport_cs_release(dev_link_t *);
/*======================================================================
======================================================================*/
-static int parport_probe(struct pcmcia_device *link)
+static int parport_attach(struct pcmcia_device *p_dev)
{
parport_info_t *info;
+ dev_link_t *link;
DEBUG(0, "parport_attach()\n");
info = kmalloc(sizeof(*info), GFP_KERNEL);
if (!info) return -ENOMEM;
memset(info, 0, sizeof(*info));
- link->priv = info;
- info->p_dev = link;
+ link = &info->link; link->priv = info;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
link->conf.Attributes = CONF_ENABLE_IRQ;
+ link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;
- return parport_config(link);
+ link->handle = p_dev;
+ p_dev->instance = link;
+
+ link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+ parport_config(link);
+
+ return 0;
} /* parport_attach */
/*======================================================================
======================================================================*/
-static void parport_detach(struct pcmcia_device *link)
+static void parport_detach(struct pcmcia_device *p_dev)
{
+ dev_link_t *link = dev_to_instance(p_dev);
+
DEBUG(0, "parport_detach(0x%p)\n", link);
- parport_cs_release(link);
+ if (link->state & DEV_CONFIG)
+ parport_cs_release(link);
kfree(link->priv);
} /* parport_detach */
#define CS_CHECK(fn, ret) \
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
-static int parport_config(struct pcmcia_device *link)
+void parport_config(dev_link_t *link)
{
+ client_handle_t handle = link->handle;
parport_info_t *info = link->priv;
tuple_t tuple;
u_short buf[128];
cisparse_t parse;
+ config_info_t conf;
cistpl_cftable_entry_t *cfg = &parse.cftable_entry;
cistpl_cftable_entry_t dflt = { 0 };
struct parport *p;
tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
tuple.Attributes = 0;
tuple.DesiredTuple = CISTPL_CONFIG;
- CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
- CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
- CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
+ CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+ CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
+
+ /* Configure card */
+ link->state |= DEV_CONFIG;
+ /* Not sure if this is right... look up the current Vcc */
+ CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
tuple.Attributes = 0;
- CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+ CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
while (1) {
- if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
- pcmcia_parse_tuple(link, &tuple, &parse) != 0)
+ if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
+ pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
goto next_entry;
if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
link->io.BasePort2 = io->win[1].base;
link->io.NumPorts2 = io->win[1].len;
}
- if (pcmcia_request_io(link, &link->io) != 0)
+ if (pcmcia_request_io(link->handle, &link->io) != 0)
goto next_entry;
/* If we've got this far, we're done */
break;
next_entry:
if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
- CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
+ CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
}
- CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
- CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+ CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
+ CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+ release_region(link->io.BasePort1, link->io.NumPorts1);
+ if (link->io.NumPorts2)
+ release_region(link->io.BasePort2, link->io.NumPorts2);
p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2,
link->irq.AssignedIRQ, PARPORT_DMA_NONE,
NULL);
info->node.minor = p->number;
info->port = p;
strcpy(info->node.dev_name, p->name);
- link->dev_node = &info->node;
-
- return 0;
+ link->dev = &info->node;
+ link->state &= ~DEV_CONFIG_PENDING;
+ return;
+
cs_failed:
- cs_error(link, last_fn, last_ret);
+ cs_error(link->handle, last_fn, last_ret);
failed:
parport_cs_release(link);
- return -ENODEV;
+ link->state &= ~DEV_CONFIG_PENDING;
+
} /* parport_config */
/*======================================================================
======================================================================*/
-void parport_cs_release(struct pcmcia_device *link)
+void parport_cs_release(dev_link_t *link)
+{
+ parport_info_t *info = link->priv;
+
+ DEBUG(0, "parport_release(0x%p)\n", link);
+
+ if (info->ndev) {
+ struct parport *p = info->port;
+ parport_pc_unregister_port(p);
+ request_region(link->io.BasePort1, link->io.NumPorts1,
+ info->node.dev_name);
+ if (link->io.NumPorts2)
+ request_region(link->io.BasePort2, link->io.NumPorts2,
+ info->node.dev_name);
+ }
+ info->ndev = 0;
+ link->dev = NULL;
+
+ pcmcia_release_configuration(link->handle);
+ pcmcia_release_io(link->handle, &link->io);
+ pcmcia_release_irq(link->handle, &link->irq);
+
+ link->state &= ~DEV_CONFIG;
+
+} /* parport_cs_release */
+
+static int parport_suspend(struct pcmcia_device *dev)
{
- parport_info_t *info = link->priv;
+ dev_link_t *link = dev_to_instance(dev);
- DEBUG(0, "parport_release(0x%p)\n", link);
+ link->state |= DEV_SUSPEND;
+ if (link->state & DEV_CONFIG)
+ pcmcia_release_configuration(link->handle);
- if (info->ndev) {
- struct parport *p = info->port;
- parport_pc_unregister_port(p);
- }
- info->ndev = 0;
+ return 0;
+}
- pcmcia_disable_device(link);
-} /* parport_cs_release */
+static int parport_resume(struct pcmcia_device *dev)
+{
+ dev_link_t *link = dev_to_instance(dev);
+
+ link->state &= ~DEV_SUSPEND;
+ if (DEV_OK(link))
+ pcmcia_request_configuration(link->handle, &link->conf);
+ return 0;
+}
static struct pcmcia_device_id parport_ids[] = {
PCMCIA_DEVICE_FUNC_ID(3),
.drv = {
.name = "parport_cs",
},
- .probe = parport_probe,
+ .probe = parport_attach,
.remove = parport_detach,
.id_table = parport_ids,
+ .suspend = parport_suspend,
+ .resume = parport_resume,
};
static int __init init_parport_cs(void)
git://git.onelab.eu / linux-2.6.git / blobdiff