d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Missed these changes to the pccard stuff. Sorry Martin!

Browse Source
This commit is contained in:
Poul-Henning Kamp 1995-09-20 07:23:51 +00:00
parent 8355a05ba8
commit 872fd9222e
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/pccard/card.h
View File

@ -97,6 +97,7 @@ struct drv_desc
int iobase; /* base of I/O ports */
int irqmask; /* Interrupt number(s) to allocate */
int flags; /* Device flags */
u_char misc[128]; /* For any random info */
};
struct pcic_reg

1
sys/pccard/cardinfo.h
View File

@ -97,6 +97,7 @@ struct drv_desc
int iobase; /* base of I/O ports */
int irqmask; /* Interrupt number(s) to allocate */
int flags; /* Device flags */
u_char misc[128]; /* For any random info */
};
struct pcic_reg

8
sys/pccard/pccard.c
View File

@ -399,9 +399,12 @@ unsigned int mask;
for (irq = 1; irq < 16; irq++)
{
mask = 1ul << irq;
if ((mask & imask) &&
register_intr(irq, 0, 0, hand, maskp, unit)==0)
if (!(mask & imask))
continue;
printf("IRQ=%d\n",irq);
if (register_intr(irq, 0, 0, hand, maskp, unit)==0)
{
printf("IRQ=%d yes!\n",irq);
if (maskp)
INTRMASK (*maskp, mask);
@ -480,6 +483,7 @@ int err, irq = 0, s;
devp->isahd.id_unit = drvp->unit;
devp->isahd.id_msize = drvp->memsize;
devp->isahd.id_iobase = drvp->iobase;
bcopy(drvp->misc, devp->misc, sizeof drvp->misc);
if (irq)
devp->isahd.id_irq = 1 << irq;
devp->isahd.id_flags = drvp->flags;

2
sys/pccard/pcic.c
View File

@ -291,7 +291,7 @@ int reg = mp->window * PCIC_MEMSIZE + PCIC_MEMBASE;
putw (cp, reg, sys_addr & 0xFFF);
putw (cp, reg+2, (sys_addr + (mp->size >> 12) - 1) & 0xFFF);
putw (cp, reg+4, ((mp->card >> 12) - sys_addr) & 0x3FFF);
#if 0
#if 1
printf("card offs = 0x%x, sys_addr = 0x%x\n", ((mp->card >> 12) - sys_addr) & 0x3FFF, sys_addr);
#endif
/*

1
sys/pccard/slot.h
View File

@ -90,6 +90,7 @@ struct pccard_dev
void *arg; /* Device argument */
struct slot *sp; /* Back pointer to slot */
int running; /* Current state of driver */
u_char misc[128]; /* For any random info */
};
/*