mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: CodingStyle fixes pcmcia: remove unused IRQ_FIRST_SHARED
This commit is contained in:
Linus Torvalds
commit
fb1beb29b5
26 changed files with 495 additions and 398 deletions
|
|
@ -108,8 +108,7 @@ static int avmcs_probe(struct pcmcia_device *p_dev)
|
|||
p_dev->io.NumPorts2 = 0;
|
||||
|
||||
/* Interrupt setup */
|
||||
p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
|
||||
p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
|
||||
p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
|
||||
|
||||
/* General socket configuration */
|
||||
p_dev->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
|
|
|
|||
|
|
@ -120,8 +120,7 @@ static int avma1cs_probe(struct pcmcia_device *p_dev)
|
|||
p_dev->io.IOAddrLines = 5;
|
||||
|
||||
/* Interrupt setup */
|
||||
p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
|
||||
p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
|
||||
p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
|
||||
|
||||
/* General socket configuration */
|
||||
p_dev->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ static int elsa_cs_probe(struct pcmcia_device *link)
|
|||
local->cardnr = -1;
|
||||
|
||||
/* Interrupt setup */
|
||||
link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
|
||||
link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
|
||||
link->irq.Handler = NULL;
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ static int sedlbauer_probe(struct pcmcia_device *link)
|
|||
link->priv = local;
|
||||
|
||||
/* Interrupt setup */
|
||||
link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
|
||||
link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
|
||||
link->irq.Handler = NULL;
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ static int teles_probe(struct pcmcia_device *link)
|
|||
link->priv = local;
|
||||
|
||||
/* Interrupt setup */
|
||||
link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
|
||||
link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
|
||||
link->irq.Handler = NULL;
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ static int try_io_port(struct pcmcia_device *link)
|
|||
/* for master/slave multifunction cards */
|
||||
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
|
||||
link->irq.Attributes =
|
||||
IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
|
||||
IRQ_TYPE_DYNAMIC_SHARING;
|
||||
}
|
||||
} else {
|
||||
/* This should be two 16-port windows */
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@ static int fmvj18x_config(struct pcmcia_device *link)
|
|||
|
||||
if (link->io.NumPorts2 != 0) {
|
||||
link->irq.Attributes =
|
||||
IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
|
||||
IRQ_TYPE_DYNAMIC_SHARING;
|
||||
ret = mfc_try_io_port(link);
|
||||
if (ret != 0) goto failed;
|
||||
} else if (cardtype == UNGERMANN) {
|
||||
|
|
|
|||
|
|
@ -490,7 +490,7 @@ static int try_io_port(struct pcmcia_device *link)
|
|||
/* for master/slave multifunction cards */
|
||||
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
|
||||
link->irq.Attributes =
|
||||
IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
|
||||
IRQ_TYPE_DYNAMIC_SHARING;
|
||||
}
|
||||
} else {
|
||||
/* This should be two 16-port windows */
|
||||
|
|
|
|||
|
|
@ -454,7 +454,7 @@ static int mhz_mfc_config(struct pcmcia_device *link)
|
|||
link->conf.Attributes |= CONF_ENABLE_SPKR;
|
||||
link->conf.Status = CCSR_AUDIO_ENA;
|
||||
link->irq.Attributes =
|
||||
IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
|
||||
IRQ_TYPE_DYNAMIC_SHARING;
|
||||
link->io.IOAddrLines = 16;
|
||||
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
|
||||
link->io.NumPorts2 = 8;
|
||||
|
|
|
|||
|
|
@ -841,7 +841,7 @@ xirc2ps_config(struct pcmcia_device * link)
|
|||
link->conf.Attributes |= CONF_ENABLE_SPKR;
|
||||
link->conf.Status |= CCSR_AUDIO_ENA;
|
||||
}
|
||||
link->irq.Attributes |= IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED ;
|
||||
link->irq.Attributes |= IRQ_TYPE_DYNAMIC_SHARING;
|
||||
link->io.NumPorts2 = 8;
|
||||
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
|
||||
if (local->dingo) {
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
#include <linux/mm.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#include <pcmcia/cs_types.h>
|
||||
#include <pcmcia/ss.h>
|
||||
|
|
@ -127,7 +127,8 @@ static int cb_setup_cis_mem(struct pcmcia_socket * s, struct resource *res)
|
|||
|
||||
=====================================================================*/
|
||||
|
||||
int read_cb_mem(struct pcmcia_socket * s, int space, u_int addr, u_int len, void *ptr)
|
||||
int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len,
|
||||
void *ptr)
|
||||
{
|
||||
struct pci_dev *dev;
|
||||
struct resource *res;
|
||||
|
|
@ -221,7 +222,7 @@ int __ref cb_alloc(struct pcmcia_socket * s)
|
|||
unsigned int max, pass;
|
||||
|
||||
s->functions = pci_scan_slot(bus, PCI_DEVFN(0, 0));
|
||||
// pcibios_fixup_bus(bus);
|
||||
/* pcibios_fixup_bus(bus); */
|
||||
|
||||
max = bus->secondary;
|
||||
for (pass = 0; pass < 2; pass++)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include <linux/mm.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <asm/io.h>
|
||||
#include <linux/io.h>
|
||||
#include <asm/byteorder.h>
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
|
|
@ -421,8 +421,6 @@ typedef struct tuple_flags {
|
|||
#define MFC_FN(f) (((tuple_flags *)(&(f)))->mfc_fn)
|
||||
#define SPACE(f) (((tuple_flags *)(&(f)))->space)
|
||||
|
||||
int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *tuple);
|
||||
|
||||
int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple)
|
||||
{
|
||||
if (!s)
|
||||
|
|
@ -526,7 +524,8 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_
|
|||
|
||||
/* End of chain? Follow long link if possible */
|
||||
if (link[0] == CISTPL_END) {
|
||||
if ((ofs = follow_link(s, tuple)) < 0)
|
||||
ofs = follow_link(s, tuple);
|
||||
if (ofs < 0)
|
||||
return -ENOSPC;
|
||||
attr = SPACE(tuple->Flags);
|
||||
read_cis_cache(s, attr, ofs, 2, link);
|
||||
|
|
@ -638,15 +637,26 @@ static int parse_device(tuple_t *tuple, cistpl_device_t *device)
|
|||
device->ndev = 0;
|
||||
for (i = 0; i < CISTPL_MAX_DEVICES; i++) {
|
||||
|
||||
if (*p == 0xff) break;
|
||||
if (*p == 0xff)
|
||||
break;
|
||||
device->dev[i].type = (*p >> 4);
|
||||
device->dev[i].wp = (*p & 0x08) ? 1 : 0;
|
||||
switch (*p & 0x07) {
|
||||
case 0: device->dev[i].speed = 0; break;
|
||||
case 1: device->dev[i].speed = 250; break;
|
||||
case 2: device->dev[i].speed = 200; break;
|
||||
case 3: device->dev[i].speed = 150; break;
|
||||
case 4: device->dev[i].speed = 100; break;
|
||||
case 0:
|
||||
device->dev[i].speed = 0;
|
||||
break;
|
||||
case 1:
|
||||
device->dev[i].speed = 250;
|
||||
break;
|
||||
case 2:
|
||||
device->dev[i].speed = 200;
|
||||
break;
|
||||
case 3:
|
||||
device->dev[i].speed = 150;
|
||||
break;
|
||||
case 4:
|
||||
device->dev[i].speed = 100;
|
||||
break;
|
||||
case 7:
|
||||
if (++p == q)
|
||||
return -EINVAL;
|
||||
|
|
@ -737,11 +747,13 @@ static int parse_strings(u_char *p, u_char *q, int max,
|
|||
ns++;
|
||||
for (;;) {
|
||||
s[j++] = (*p == 0xff) ? '\0' : *p;
|
||||
if ((*p == '\0') || (*p == 0xff)) break;
|
||||
if ((*p == '\0') || (*p == 0xff))
|
||||
break;
|
||||
if (++p == q)
|
||||
return -EINVAL;
|
||||
}
|
||||
if ((*p == 0xff) || (++p == q)) break;
|
||||
if ((*p == 0xff) || (++p == q))
|
||||
break;
|
||||
}
|
||||
if (found) {
|
||||
*found = ns;
|
||||
|
|
@ -793,7 +805,8 @@ static int parse_jedec(tuple_t *tuple, cistpl_jedec_t *jedec)
|
|||
q = p + tuple->TupleDataLen;
|
||||
|
||||
for (nid = 0; nid < CISTPL_MAX_DEVICES; nid++) {
|
||||
if (p > q-2) break;
|
||||
if (p > q-2)
|
||||
break;
|
||||
jedec->id[nid].mfr = p[0];
|
||||
jedec->id[nid].info = p[1];
|
||||
p += 2;
|
||||
|
|
@ -880,17 +893,20 @@ static u_char *parse_power(u_char *p, u_char *q,
|
|||
int i;
|
||||
u_int scale;
|
||||
|
||||
if (p == q) return NULL;
|
||||
if (p == q)
|
||||
return NULL;
|
||||
pwr->present = *p;
|
||||
pwr->flags = 0;
|
||||
p++;
|
||||
for (i = 0; i < 7; i++)
|
||||
if (pwr->present & (1<<i)) {
|
||||
if (p == q) return NULL;
|
||||
if (p == q)
|
||||
return NULL;
|
||||
pwr->param[i] = POWER_CVT(*p);
|
||||
scale = POWER_SCALE(*p);
|
||||
while (*p & 0x80) {
|
||||
if (++p == q) return NULL;
|
||||
if (++p == q)
|
||||
return NULL;
|
||||
if ((*p & 0x7f) < 100)
|
||||
pwr->param[i] += (*p & 0x7f) * scale / 100;
|
||||
else if (*p == 0x7d)
|
||||
|
|
@ -914,24 +930,28 @@ static u_char *parse_timing(u_char *p, u_char *q,
|
|||
{
|
||||
u_char scale;
|
||||
|
||||
if (p == q) return NULL;
|
||||
if (p == q)
|
||||
return NULL;
|
||||
scale = *p;
|
||||
if ((scale & 3) != 3) {
|
||||
if (++p == q) return NULL;
|
||||
if (++p == q)
|
||||
return NULL;
|
||||
timing->wait = SPEED_CVT(*p);
|
||||
timing->waitscale = exponent[scale & 3];
|
||||
} else
|
||||
timing->wait = 0;
|
||||
scale >>= 2;
|
||||
if ((scale & 7) != 7) {
|
||||
if (++p == q) return NULL;
|
||||
if (++p == q)
|
||||
return NULL;
|
||||
timing->ready = SPEED_CVT(*p);
|
||||
timing->rdyscale = exponent[scale & 7];
|
||||
} else
|
||||
timing->ready = 0;
|
||||
scale >>= 3;
|
||||
if (scale != 7) {
|
||||
if (++p == q) return NULL;
|
||||
if (++p == q)
|
||||
return NULL;
|
||||
timing->reserved = SPEED_CVT(*p);
|
||||
timing->rsvscale = exponent[scale];
|
||||
} else
|
||||
|
|
@ -946,7 +966,8 @@ static u_char *parse_io(u_char *p, u_char *q, cistpl_io_t *io)
|
|||
{
|
||||
int i, j, bsz, lsz;
|
||||
|
||||
if (p == q) return NULL;
|
||||
if (p == q)
|
||||
return NULL;
|
||||
io->flags = *p;
|
||||
|
||||
if (!(*p & 0x80)) {
|
||||
|
|
@ -956,23 +977,28 @@ static u_char *parse_io(u_char *p, u_char *q, cistpl_io_t *io)
|
|||
return p+1;
|
||||
}
|
||||
|
||||
if (++p == q) return NULL;
|
||||
if (++p == q)
|
||||
return NULL;
|
||||
io->nwin = (*p & 0x0f) + 1;
|
||||
bsz = (*p & 0x30) >> 4;
|
||||
if (bsz == 3) bsz++;
|
||||
if (bsz == 3)
|
||||
bsz++;
|
||||
lsz = (*p & 0xc0) >> 6;
|
||||
if (lsz == 3) lsz++;
|
||||
if (lsz == 3)
|
||||
lsz++;
|
||||
p++;
|
||||
|
||||
for (i = 0; i < io->nwin; i++) {
|
||||
io->win[i].base = 0;
|
||||
io->win[i].len = 1;
|
||||
for (j = 0; j < bsz; j++, p++) {
|
||||
if (p == q) return NULL;
|
||||
if (p == q)
|
||||
return NULL;
|
||||
io->win[i].base += *p << (j*8);
|
||||
}
|
||||
for (j = 0; j < lsz; j++, p++) {
|
||||
if (p == q) return NULL;
|
||||
if (p == q)
|
||||
return NULL;
|
||||
io->win[i].len += *p << (j*8);
|
||||
}
|
||||
}
|
||||
|
|
@ -986,27 +1012,32 @@ static u_char *parse_mem(u_char *p, u_char *q, cistpl_mem_t *mem)
|
|||
int i, j, asz, lsz, has_ha;
|
||||
u_int len, ca, ha;
|
||||
|
||||
if (p == q) return NULL;
|
||||
if (p == q)
|
||||
return NULL;
|
||||
|
||||
mem->nwin = (*p & 0x07) + 1;
|
||||
lsz = (*p & 0x18) >> 3;
|
||||
asz = (*p & 0x60) >> 5;
|
||||
has_ha = (*p & 0x80);
|
||||
if (++p == q) return NULL;
|
||||
if (++p == q)
|
||||
return NULL;
|
||||
|
||||
for (i = 0; i < mem->nwin; i++) {
|
||||
len = ca = ha = 0;
|
||||
for (j = 0; j < lsz; j++, p++) {
|
||||
if (p == q) return NULL;
|
||||
if (p == q)
|
||||
return NULL;
|
||||
len += *p << (j*8);
|
||||
}
|
||||
for (j = 0; j < asz; j++, p++) {
|
||||
if (p == q) return NULL;
|
||||
if (p == q)
|
||||
return NULL;
|
||||
ca += *p << (j*8);
|
||||
}
|
||||
if (has_ha)
|
||||
for (j = 0; j < asz; j++, p++) {
|
||||
if (p == q) return NULL;
|
||||
if (p == q)
|
||||
return NULL;
|
||||
ha += *p << (j*8);
|
||||
}
|
||||
mem->win[i].len = len << 8;
|
||||
|
|
@ -1281,7 +1312,8 @@ static int parse_device_geo(tuple_t *tuple, cistpl_device_geo_t *geo)
|
|||
q = p + tuple->TupleDataLen;
|
||||
|
||||
for (n = 0; n < CISTPL_MAX_DEVICES; n++) {
|
||||
if (p > q-6) break;
|
||||
if (p > q-6)
|
||||
break;
|
||||
geo->geo[n].buswidth = p[0];
|
||||
geo->geo[n].erase_block = 1 << (p[1]-1);
|
||||
geo->geo[n].read_block = 1 << (p[2]-1);
|
||||
|
|
@ -1332,7 +1364,8 @@ static int parse_org(tuple_t *tuple, cistpl_org_t *org)
|
|||
return -EINVAL;
|
||||
for (i = 0; i < 30; i++) {
|
||||
org->desc[i] = *p;
|
||||
if (*p == '\0') break;
|
||||
if (*p == '\0')
|
||||
break;
|
||||
if (++p == q)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt)
|
|||
put_device(&skt->dev);
|
||||
return NULL;
|
||||
}
|
||||
return (skt);
|
||||
return skt;
|
||||
}
|
||||
EXPORT_SYMBOL(pcmcia_get_socket);
|
||||
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ put_module:
|
|||
put_dev:
|
||||
if (ret)
|
||||
put_device(dev);
|
||||
return (ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -630,7 +630,7 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
|
|||
for (i = 0; i < no_funcs; i++)
|
||||
pcmcia_device_add(s, i);
|
||||
|
||||
return (ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -756,7 +756,7 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
|
|||
release:
|
||||
release_firmware(fw);
|
||||
|
||||
return (ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
#else /* !CONFIG_PCMCIA_LOAD_CIS */
|
||||
|
|
@ -865,7 +865,8 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
|
|||
}
|
||||
|
||||
|
||||
static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
|
||||
static int pcmcia_bus_match(struct device *dev, struct device_driver *drv)
|
||||
{
|
||||
struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
|
||||
struct pcmcia_driver *p_drv = to_pcmcia_drv(drv);
|
||||
struct pcmcia_device_id *did = p_drv->id_table;
|
||||
|
|
@ -1042,7 +1043,8 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
|
|||
for (i = 0; i < 4; i++) {
|
||||
if (!p_dev->prod_id[i])
|
||||
continue;
|
||||
hash[i] = crc32(0,p_dev->prod_id[i],strlen(p_dev->prod_id[i]));
|
||||
hash[i] = crc32(0, p_dev->prod_id[i],
|
||||
strlen(p_dev->prod_id[i]));
|
||||
}
|
||||
return sprintf(buf, "pcmcia:m%04Xc%04Xf%02Xfn%02Xpfn%02X"
|
||||
"pa%08Xpb%08Xpc%08Xpd%08X\n",
|
||||
|
|
@ -1329,7 +1331,7 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,
|
|||
if (ret) {
|
||||
dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");
|
||||
pcmcia_put_socket(socket);
|
||||
return (ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -88,12 +88,12 @@ static struct pcmcia_driver *get_pcmcia_driver(dev_info_t *dev_info)
|
|||
|
||||
p_drv = container_of(drv, struct pcmcia_driver, drv);
|
||||
|
||||
return (p_drv);
|
||||
return p_drv;
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
static struct proc_dir_entry *proc_pccard = NULL;
|
||||
static struct proc_dir_entry *proc_pccard;
|
||||
|
||||
static int proc_read_drivers_callback(struct device_driver *driver, void *_m)
|
||||
{
|
||||
|
|
@ -158,7 +158,8 @@ static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)
|
|||
|
||||
#else
|
||||
|
||||
static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) {
|
||||
static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -215,7 +216,7 @@ static int pcmcia_adjust_resource_info(adjust_t *adj)
|
|||
}
|
||||
up_read(&pcmcia_socket_list_rwsem);
|
||||
|
||||
return (ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -558,7 +559,7 @@ rescan:
|
|||
err_put:
|
||||
pcmcia_put_socket(s);
|
||||
|
||||
return (ret);
|
||||
return ret;
|
||||
} /* bind_request */
|
||||
|
||||
#ifdef CONFIG_CARDBUS
|
||||
|
|
@ -655,7 +656,7 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int
|
|||
|
||||
err_put:
|
||||
pcmcia_put_dev(p_dev);
|
||||
return (ret);
|
||||
return ret;
|
||||
} /* get_device_info */
|
||||
|
||||
|
||||
|
|
@ -664,7 +665,7 @@ static int ds_open(struct inode *inode, struct file *file)
|
|||
socket_t i = iminor(inode);
|
||||
struct pcmcia_socket *s;
|
||||
user_info_t *user;
|
||||
static int warning_printed = 0;
|
||||
static int warning_printed;
|
||||
int ret = 0;
|
||||
|
||||
pr_debug("ds_open(socket %d)\n", i);
|
||||
|
|
@ -738,12 +739,13 @@ static int ds_release(struct inode *inode, struct file *file)
|
|||
s = user->socket;
|
||||
|
||||
/* Unlink user data structure */
|
||||
if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
|
||||
if ((file->f_flags & O_ACCMODE) != O_RDONLY)
|
||||
s->pcmcia_state.busy = 0;
|
||||
}
|
||||
|
||||
file->private_data = NULL;
|
||||
for (link = &s->user; *link; link = &(*link)->next)
|
||||
if (*link == user) break;
|
||||
if (*link == user)
|
||||
break;
|
||||
if (link == NULL)
|
||||
goto out;
|
||||
*link = user->next;
|
||||
|
|
@ -845,7 +847,8 @@ static int ds_ioctl(struct inode * inode, struct file * file,
|
|||
return -EIO;
|
||||
|
||||
size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
|
||||
if (size > sizeof(ds_ioctl_arg_t)) return -EINVAL;
|
||||
if (size > sizeof(ds_ioctl_arg_t))
|
||||
return -EINVAL;
|
||||
|
||||
/* Permission check */
|
||||
if (!(cmd & IOC_OUT) && !capable(CAP_SYS_ADMIN))
|
||||
|
|
@ -1045,7 +1048,8 @@ static const struct file_operations ds_fops = {
|
|||
.poll = ds_poll,
|
||||
};
|
||||
|
||||
void __init pcmcia_setup_ioctl(void) {
|
||||
void __init pcmcia_setup_ioctl(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* Set up character device for user mode clients */
|
||||
|
|
@ -1064,7 +1068,8 @@ void __init pcmcia_setup_ioctl(void) {
|
|||
}
|
||||
|
||||
|
||||
void __exit pcmcia_cleanup_ioctl(void) {
|
||||
void __exit pcmcia_cleanup_ioctl(void)
|
||||
{
|
||||
#ifdef CONFIG_PROC_FS
|
||||
if (proc_pccard) {
|
||||
remove_proc_entry("drivers", proc_pccard);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
|
||||
/* Access speed for IO windows */
|
||||
static int io_speed = 0;
|
||||
static int io_speed;
|
||||
module_param(io_speed, int, 0444);
|
||||
|
||||
|
||||
|
|
@ -62,7 +62,8 @@ static int alloc_io_space(struct pcmcia_socket *s, u_int attr,
|
|||
num, align);
|
||||
align = 0;
|
||||
} else
|
||||
while (align && (align < num)) align <<= 1;
|
||||
while (align && (align < num))
|
||||
align <<= 1;
|
||||
}
|
||||
if (*base & ~(align-1)) {
|
||||
dev_dbg(&s->dev, "odd IO request: base %#x align %#x\n",
|
||||
|
|
@ -383,9 +384,8 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)
|
|||
s->irq.AssignedIRQ = 0;
|
||||
}
|
||||
|
||||
if (req->Handler) {
|
||||
if (req->Handler)
|
||||
free_irq(req->AssignedIRQ, p_dev->priv);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PCMCIA_PROBE
|
||||
pcmcia_used_irq[req->AssignedIRQ]--;
|
||||
|
|
@ -656,7 +656,8 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
|
|||
type = IRQF_SHARED;
|
||||
else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
|
||||
type = IRQF_SHARED;
|
||||
else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");
|
||||
else
|
||||
printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");
|
||||
|
||||
#ifdef CONFIG_PCMCIA_PROBE
|
||||
|
||||
|
|
@ -788,7 +789,8 @@ int pcmcia_request_window(struct pcmcia_device *p_dev, win_req_t *req, window_ha
|
|||
|
||||
/* Allocate system memory window */
|
||||
for (w = 0; w < MAX_WIN; w++)
|
||||
if (!(s->state & SOCKET_WIN_REQ(w))) break;
|
||||
if (!(s->state & SOCKET_WIN_REQ(w)))
|
||||
break;
|
||||
if (w == MAX_WIN) {
|
||||
dev_dbg(&s->dev, "all windows are used already\n");
|
||||
return -EINVAL;
|
||||
|
|
@ -826,18 +828,19 @@ int pcmcia_request_window(struct pcmcia_device *p_dev, win_req_t *req, window_ha
|
|||
s->state |= SOCKET_WIN_REQ(w);
|
||||
|
||||
/* Return window handle */
|
||||
if (s->features & SS_CAP_STATIC_MAP) {
|
||||
if (s->features & SS_CAP_STATIC_MAP)
|
||||
req->Base = win->static_start;
|
||||
} else {
|
||||
else
|
||||
req->Base = win->res->start;
|
||||
}
|
||||
|
||||
*wh = w + 1;
|
||||
|
||||
return 0;
|
||||
} /* pcmcia_request_window */
|
||||
EXPORT_SYMBOL(pcmcia_request_window);
|
||||
|
||||
void pcmcia_disable_device(struct pcmcia_device *p_dev) {
|
||||
void pcmcia_disable_device(struct pcmcia_device *p_dev)
|
||||
{
|
||||
pcmcia_release_configuration(p_dev);
|
||||
pcmcia_release_io(p_dev, &p_dev->io);
|
||||
pcmcia_release_irq(p_dev, &p_dev->irq);
|
||||
|
|
@ -970,7 +973,7 @@ int pcmcia_loop_tuple(struct pcmcia_device *p_dev, cisdata_t code,
|
|||
|
||||
return pccard_loop_tuple(p_dev->socket, p_dev->func, code, NULL,
|
||||
&loop, pcmcia_do_loop_tuple);
|
||||
};
|
||||
}
|
||||
EXPORT_SYMBOL(pcmcia_loop_tuple);
|
||||
|
||||
|
||||
|
|
@ -1000,7 +1003,7 @@ static int pcmcia_do_get_tuple(struct pcmcia_device *p_dev, tuple_t *tuple,
|
|||
} else
|
||||
dev_dbg(&p_dev->dev, "do_get_tuple: out of memory\n");
|
||||
return 0;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* pcmcia_get_tuple() - get first tuple from CIS
|
||||
|
|
@ -1024,7 +1027,7 @@ size_t pcmcia_get_tuple(struct pcmcia_device *p_dev, cisdata_t code,
|
|||
pcmcia_loop_tuple(p_dev, code, pcmcia_do_get_tuple, &get);
|
||||
|
||||
return get.len;
|
||||
};
|
||||
}
|
||||
EXPORT_SYMBOL(pcmcia_get_tuple);
|
||||
|
||||
|
||||
|
|
@ -1057,7 +1060,7 @@ static int pcmcia_do_get_mac(struct pcmcia_device *p_dev, tuple_t *tuple,
|
|||
for (i = 0; i < 6; i++)
|
||||
dev->dev_addr[i] = tuple->TupleData[i+2];
|
||||
return 0;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* pcmcia_get_mac_from_cis() - read out MAC address from CISTPL_FUNCE
|
||||
|
|
@ -1071,6 +1074,6 @@ static int pcmcia_do_get_mac(struct pcmcia_device *p_dev, tuple_t *tuple,
|
|||
int pcmcia_get_mac_from_cis(struct pcmcia_device *p_dev, struct net_device *dev)
|
||||
{
|
||||
return pcmcia_loop_tuple(p_dev, CISTPL_FUNCE, pcmcia_do_get_mac, dev);
|
||||
};
|
||||
}
|
||||
EXPORT_SYMBOL(pcmcia_get_mac_from_cis);
|
||||
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@
|
|||
#include <linux/timer.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <asm/irq.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#include <pcmcia/cs_types.h>
|
||||
#include <pcmcia/ss.h>
|
||||
|
|
@ -168,7 +168,8 @@ static int sub_interval(struct resource_map *map, u_long base, u_long num)
|
|||
q->num = base - q->base;
|
||||
} else {
|
||||
/* Split the block into two pieces */
|
||||
p = kmalloc(sizeof(struct resource_map), GFP_KERNEL);
|
||||
p = kmalloc(sizeof(struct resource_map),
|
||||
GFP_KERNEL);
|
||||
if (!p) {
|
||||
printk(KERN_WARNING "out of memory to update resources\n");
|
||||
return -ENOMEM;
|
||||
|
|
@ -212,26 +213,29 @@ static void do_io_probe(struct pcmcia_socket *s, unsigned int base,
|
|||
return;
|
||||
}
|
||||
for (i = base, most = 0; i < base+num; i += 8) {
|
||||
res = claim_region(NULL, i, 8, IORESOURCE_IO, "PCMCIA IO probe");
|
||||
res = claim_region(NULL, i, 8, IORESOURCE_IO, "PCMCIA ioprobe");
|
||||
if (!res)
|
||||
continue;
|
||||
hole = inb(i);
|
||||
for (j = 1; j < 8; j++)
|
||||
if (inb(i+j) != hole) break;
|
||||
if (inb(i+j) != hole)
|
||||
break;
|
||||
free_region(res);
|
||||
if ((j == 8) && (++b[hole] > b[most]))
|
||||
most = hole;
|
||||
if (b[most] == 127) break;
|
||||
if (b[most] == 127)
|
||||
break;
|
||||
}
|
||||
kfree(b);
|
||||
|
||||
bad = any = 0;
|
||||
for (i = base; i < base+num; i += 8) {
|
||||
res = claim_region(NULL, i, 8, IORESOURCE_IO, "PCMCIA IO probe");
|
||||
res = claim_region(NULL, i, 8, IORESOURCE_IO, "PCMCIA ioprobe");
|
||||
if (!res)
|
||||
continue;
|
||||
for (j = 0; j < 8; j++)
|
||||
if (inb(i+j) != most) break;
|
||||
if (inb(i+j) != most)
|
||||
break;
|
||||
free_region(res);
|
||||
if (j < 8) {
|
||||
if (!any)
|
||||
|
|
@ -327,8 +331,9 @@ cis_readable(struct pcmcia_socket *s, unsigned long base, unsigned long size)
|
|||
unsigned int info1, info2;
|
||||
int ret = 0;
|
||||
|
||||
res1 = claim_region(s, base, size/2, IORESOURCE_MEM, "cs memory probe");
|
||||
res2 = claim_region(s, base + size/2, size/2, IORESOURCE_MEM, "cs memory probe");
|
||||
res1 = claim_region(s, base, size/2, IORESOURCE_MEM, "PCMCIA memprobe");
|
||||
res2 = claim_region(s, base + size/2, size/2, IORESOURCE_MEM,
|
||||
"PCMCIA memprobe");
|
||||
|
||||
if (res1 && res2) {
|
||||
ret = readable(s, res1, &info1);
|
||||
|
|
@ -347,8 +352,9 @@ checksum_match(struct pcmcia_socket *s, unsigned long base, unsigned long size)
|
|||
struct resource *res1, *res2;
|
||||
int a = -1, b = -1;
|
||||
|
||||
res1 = claim_region(s, base, size/2, IORESOURCE_MEM, "cs memory probe");
|
||||
res2 = claim_region(s, base + size/2, size/2, IORESOURCE_MEM, "cs memory probe");
|
||||
res1 = claim_region(s, base, size/2, IORESOURCE_MEM, "PCMCIA memprobe");
|
||||
res2 = claim_region(s, base + size/2, size/2, IORESOURCE_MEM,
|
||||
"PCMCIA memprobe");
|
||||
|
||||
if (res1 && res2) {
|
||||
a = checksum(s, res1);
|
||||
|
|
@ -399,14 +405,15 @@ static int do_mem_probe(u_long base, u_long num, struct pcmcia_socket *s)
|
|||
break;
|
||||
}
|
||||
if (i != j) {
|
||||
if (!bad) printk(" excluding");
|
||||
if (!bad)
|
||||
printk(" excluding");
|
||||
printk(" %#05lx-%#05lx", i, j-1);
|
||||
sub_interval(&s_data->mem_db, i, j-i);
|
||||
bad += j-i;
|
||||
}
|
||||
}
|
||||
printk(bad ? "\n" : " clean.\n");
|
||||
return (num - bad);
|
||||
return num - bad;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PCMCIA_PROBE
|
||||
|
|
@ -915,7 +922,7 @@ static ssize_t show_io_db(struct device *dev,
|
|||
}
|
||||
|
||||
mutex_unlock(&rsrc_mutex);
|
||||
return (ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t store_io_db(struct device *dev,
|
||||
|
|
@ -932,7 +939,8 @@ static ssize_t store_io_db(struct device *dev,
|
|||
ret = sscanf(buf, "- 0x%lx - 0x%lx", &start_addr, &end_addr);
|
||||
add = REMOVE_MANAGED_RESOURCE;
|
||||
if (ret != 2) {
|
||||
ret = sscanf (buf, "0x%lx - 0x%lx", &start_addr, &end_addr);
|
||||
ret = sscanf(buf, "0x%lx - 0x%lx", &start_addr,
|
||||
&end_addr);
|
||||
add = ADD_MANAGED_RESOURCE;
|
||||
if (ret != 2)
|
||||
return -EINVAL;
|
||||
|
|
@ -970,7 +978,7 @@ static ssize_t show_mem_db(struct device *dev,
|
|||
}
|
||||
|
||||
mutex_unlock(&rsrc_mutex);
|
||||
return (ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t store_mem_db(struct device *dev,
|
||||
|
|
@ -987,7 +995,8 @@ static ssize_t store_mem_db(struct device *dev,
|
|||
ret = sscanf(buf, "- 0x%lx - 0x%lx", &start_addr, &end_addr);
|
||||
add = REMOVE_MANAGED_RESOURCE;
|
||||
if (ret != 2) {
|
||||
ret = sscanf (buf, "0x%lx - 0x%lx", &start_addr, &end_addr);
|
||||
ret = sscanf(buf, "0x%lx - 0x%lx", &start_addr,
|
||||
&end_addr);
|
||||
add = ADD_MANAGED_RESOURCE;
|
||||
if (ret != 2)
|
||||
return -EINVAL;
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ static ssize_t pccard_extract_cis(struct pcmcia_socket *s, char *buf, loff_t off
|
|||
free_tuple:
|
||||
kfree(tuplebuffer);
|
||||
|
||||
return (ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t pccard_show_cis(struct kobject *kobj,
|
||||
|
|
@ -308,7 +308,7 @@ static ssize_t pccard_show_cis(struct kobject *kobj,
|
|||
count = pccard_extract_cis(s, buf, off, count);
|
||||
}
|
||||
|
||||
return (count);
|
||||
return count;
|
||||
}
|
||||
|
||||
static ssize_t pccard_store_cis(struct kobject *kobj,
|
||||
|
|
|
|||
|
|
@ -16,13 +16,12 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <pcmcia/cs_types.h>
|
||||
#include <pcmcia/ss.h>
|
||||
#include <pcmcia/cs.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
|
||||
#include "yenta_socket.h"
|
||||
#include "i82365.h"
|
||||
|
||||
|
|
@ -237,24 +236,42 @@ static void yenta_set_power(struct yenta_socket *socket, socket_state_t *state)
|
|||
/* i82365SL-DF style */
|
||||
if (socket->flags & YENTA_16BIT_POWER_DF) {
|
||||
switch (state->Vcc) {
|
||||
case 33: reg |= I365_VCC_3V; break;
|
||||
case 50: reg |= I365_VCC_5V; break;
|
||||
default: reg = 0; break;
|
||||
case 33:
|
||||
reg |= I365_VCC_3V;
|
||||
break;
|
||||
case 50:
|
||||
reg |= I365_VCC_5V;
|
||||
break;
|
||||
default:
|
||||
reg = 0;
|
||||
break;
|
||||
}
|
||||
switch (state->Vpp) {
|
||||
case 33:
|
||||
case 50: reg |= I365_VPP1_5V; break;
|
||||
case 120: reg |= I365_VPP1_12V; break;
|
||||
case 50:
|
||||
reg |= I365_VPP1_5V;
|
||||
break;
|
||||
case 120:
|
||||
reg |= I365_VPP1_12V;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
/* i82365SL-B style */
|
||||
switch (state->Vcc) {
|
||||
case 50: reg |= I365_VCC_5V; break;
|
||||
default: reg = 0; break;
|
||||
case 50:
|
||||
reg |= I365_VCC_5V;
|
||||
break;
|
||||
default:
|
||||
reg = 0;
|
||||
break;
|
||||
}
|
||||
switch (state->Vpp) {
|
||||
case 50: reg |= I365_VPP1_5V | I365_VPP2_5V; break;
|
||||
case 120: reg |= I365_VPP1_12V | I365_VPP2_12V; break;
|
||||
case 50:
|
||||
reg |= I365_VPP1_5V | I365_VPP2_5V;
|
||||
break;
|
||||
case 120:
|
||||
reg |= I365_VPP1_12V | I365_VPP2_12V;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -263,14 +280,26 @@ static void yenta_set_power(struct yenta_socket *socket, socket_state_t *state)
|
|||
} else {
|
||||
u32 reg = 0; /* CB_SC_STPCLK? */
|
||||
switch (state->Vcc) {
|
||||
case 33: reg = CB_SC_VCC_3V; break;
|
||||
case 50: reg = CB_SC_VCC_5V; break;
|
||||
default: reg = 0; break;
|
||||
case 33:
|
||||
reg = CB_SC_VCC_3V;
|
||||
break;
|
||||
case 50:
|
||||
reg = CB_SC_VCC_5V;
|
||||
break;
|
||||
default:
|
||||
reg = 0;
|
||||
break;
|
||||
}
|
||||
switch (state->Vpp) {
|
||||
case 33: reg |= CB_SC_VPP_3V; break;
|
||||
case 50: reg |= CB_SC_VPP_5V; break;
|
||||
case 120: reg |= CB_SC_VPP_12V; break;
|
||||
case 33:
|
||||
reg |= CB_SC_VPP_3V;
|
||||
break;
|
||||
case 50:
|
||||
reg |= CB_SC_VPP_5V;
|
||||
break;
|
||||
case 120:
|
||||
reg |= CB_SC_VPP_12V;
|
||||
break;
|
||||
}
|
||||
if (reg != cb_readl(socket, CB_SOCKET_CONTROL))
|
||||
cb_writel(socket, CB_SOCKET_CONTROL, reg);
|
||||
|
|
@ -314,19 +343,25 @@ static int yenta_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
|
|||
|
||||
reg = exca_readb(socket, I365_POWER) & (I365_VCC_MASK|I365_VPP1_MASK);
|
||||
reg |= I365_PWR_NORESET;
|
||||
if (state->flags & SS_PWR_AUTO) reg |= I365_PWR_AUTO;
|
||||
if (state->flags & SS_OUTPUT_ENA) reg |= I365_PWR_OUT;
|
||||
if (state->flags & SS_PWR_AUTO)
|
||||
reg |= I365_PWR_AUTO;
|
||||
if (state->flags & SS_OUTPUT_ENA)
|
||||
reg |= I365_PWR_OUT;
|
||||
if (exca_readb(socket, I365_POWER) != reg)
|
||||
exca_writeb(socket, I365_POWER, reg);
|
||||
|
||||
/* CSC interrupt: no ISA irq for CSC */
|
||||
reg = I365_CSC_DETECT;
|
||||
if (state->flags & SS_IOCARD) {
|
||||
if (state->csc_mask & SS_STSCHG) reg |= I365_CSC_STSCHG;
|
||||
if (state->csc_mask & SS_STSCHG)
|
||||
reg |= I365_CSC_STSCHG;
|
||||
} else {
|
||||
if (state->csc_mask & SS_BATDEAD) reg |= I365_CSC_BVD1;
|
||||
if (state->csc_mask & SS_BATWARN) reg |= I365_CSC_BVD2;
|
||||
if (state->csc_mask & SS_READY) reg |= I365_CSC_READY;
|
||||
if (state->csc_mask & SS_BATDEAD)
|
||||
reg |= I365_CSC_BVD1;
|
||||
if (state->csc_mask & SS_BATWARN)
|
||||
reg |= I365_CSC_BVD2;
|
||||
if (state->csc_mask & SS_READY)
|
||||
reg |= I365_CSC_READY;
|
||||
}
|
||||
exca_writeb(socket, I365_CSCINT, reg);
|
||||
exca_readb(socket, I365_CSC);
|
||||
|
|
@ -368,9 +403,12 @@ static int yenta_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io
|
|||
exca_writew(socket, I365_IO(map)+I365_W_STOP, io->stop);
|
||||
|
||||
ioctl = exca_readb(socket, I365_IOCTL) & ~I365_IOCTL_MASK(map);
|
||||
if (io->flags & MAP_0WS) ioctl |= I365_IOCTL_0WS(map);
|
||||
if (io->flags & MAP_16BIT) ioctl |= I365_IOCTL_16BIT(map);
|
||||
if (io->flags & MAP_AUTOSZ) ioctl |= I365_IOCTL_IOCS16(map);
|
||||
if (io->flags & MAP_0WS)
|
||||
ioctl |= I365_IOCTL_0WS(map);
|
||||
if (io->flags & MAP_16BIT)
|
||||
ioctl |= I365_IOCTL_16BIT(map);
|
||||
if (io->flags & MAP_AUTOSZ)
|
||||
ioctl |= I365_IOCTL_IOCS16(map);
|
||||
exca_writeb(socket, I365_IOCTL, ioctl);
|
||||
|
||||
if (io->flags & MAP_ACTIVE)
|
||||
|
|
@ -416,10 +454,17 @@ static int yenta_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *
|
|||
|
||||
word = (stop >> 12) & 0x0fff;
|
||||
switch (to_cycles(mem->speed)) {
|
||||
case 0: break;
|
||||
case 1: word |= I365_MEM_WS0; break;
|
||||
case 2: word |= I365_MEM_WS1; break;
|
||||
default: word |= I365_MEM_WS1 | I365_MEM_WS0; break;
|
||||
case 0:
|
||||
break;
|
||||
case 1:
|
||||
word |= I365_MEM_WS0;
|
||||
break;
|
||||
case 2:
|
||||
word |= I365_MEM_WS1;
|
||||
break;
|
||||
default:
|
||||
word |= I365_MEM_WS1 | I365_MEM_WS0;
|
||||
break;
|
||||
}
|
||||
exca_writew(socket, I365_MEM(map) + I365_W_STOP, word);
|
||||
|
||||
|
|
@ -547,9 +592,9 @@ static int yenta_sock_suspend(struct pcmcia_socket *sock)
|
|||
* max 4 MB, min 16 kB. We try very hard to not get below
|
||||
* the "ACC" values, though.
|
||||
*/
|
||||
#define BRIDGE_MEM_MAX 4*1024*1024
|
||||
#define BRIDGE_MEM_ACC 128*1024
|
||||
#define BRIDGE_MEM_MIN 16*1024
|
||||
#define BRIDGE_MEM_MAX (4*1024*1024)
|
||||
#define BRIDGE_MEM_ACC (128*1024)
|
||||
#define BRIDGE_MEM_MIN (16*1024)
|
||||
|
||||
#define BRIDGE_IO_MAX 512
|
||||
#define BRIDGE_IO_ACC 256
|
||||
|
|
|
|||
|
|
@ -126,8 +126,8 @@ typedef struct irq_req_t {
|
|||
#define IRQ_TYPE_TIME 0x01
|
||||
#define IRQ_TYPE_DYNAMIC_SHARING 0x02
|
||||
#define IRQ_FORCED_PULSE 0x04
|
||||
#define IRQ_FIRST_SHARED 0x08
|
||||
//#define IRQ_HANDLE_PRESENT 0x10
|
||||
#define IRQ_FIRST_SHARED 0x08 /* unused */
|
||||
#define IRQ_HANDLE_PRESENT 0x10 /* unused */
|
||||
#define IRQ_PULSE_ALLOCATED 0x100
|
||||
|
||||
/* Bits in IRQInfo1 field */
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
#ifndef _LINUX_MEM_OP_H
|
||||
#define _LINUX_MEM_OP_H
|
||||
|
||||
#include <linux/io.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
/*
|
||||
If UNSAFE_MEMCPY is defined, we use the (optimized) system routines
|
||||
|
|
|
|||
|
|
@ -143,7 +143,8 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
|
|||
link->io.NumPorts1 = 16;
|
||||
|
||||
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE;
|
||||
// link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
|
||||
/* FIXME: This driver should be updated to allow for dynamic IRQ sharing */
|
||||
/* link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FORCED_PULSE; */
|
||||
|
||||
link->irq.Handler = pdacf_interrupt;
|
||||
link->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
|
|
|
|||
Loading…
Reference in a new issue