diff options
| author | bde <bde@FreeBSD.org> | 1995-11-13 08:39:44 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1995-11-13 08:39:44 +0000 |
| commit | 78909de5f53e5b919d5f6f05f5353dcc6e2b5520 (patch) | |
| tree | c23729bd20dc3fe979ae1d027aa43f8c96b3661c /sys/pccard | |
| parent | 613c8ea3c32a222032685a5feff7e08de221f00b (diff) | |
| download | FreeBSD-src-78909de5f53e5b919d5f6f05f5353dcc6e2b5520.zip FreeBSD-src-78909de5f53e5b919d5f6f05f5353dcc6e2b5520.tar.gz | |
Fixed the type of yet another timeout function.
Fixed the type of pcic_unload().
Replaced nosys() by lkm_nullcmd() in pcic_mod() and in a misplaced
comment about the lkm interface.
Diffstat (limited to 'sys/pccard')
| -rw-r--r-- | sys/pccard/pcic.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index cfbb9b9..d5d4591 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -80,7 +80,7 @@ struct kern_devconf kdc_pcic[PCIC_MAX_SLOTS] = { static void pcicintr __P((int unit)); static int pcic_ioctl __P((struct slot *, int, caddr_t)); static int pcic_power __P((struct slot *)); -static void pcic_reset __P((struct slot *)); +static timeout_t pcic_reset; static void pcic_disable __P((struct slot *)); static void pcic_mapirq __P((struct slot *, int)); static timeout_t pcictimeout; @@ -199,7 +199,7 @@ pcic_handle(struct lkm_table *lkmtp, int cmd) */ case LKM_E_UNLOAD: printf("Unloading PCIC driver\n"); - err = pcic_unload(); + err = pcic_unload(lkmtp, cmd); break; /* Success*/ default: /* we only understand load/unload*/ @@ -214,8 +214,8 @@ pcic_handle(struct lkm_table *lkmtp, int cmd) * External entry point; should generally match name of .o file. The * arguments are always the same for all loaded modules. The "load", * "unload", and "stat" functions in "DISPATCH" will be called under - * their respective circumstances unless their value is "nosys". If - * called, they are called with the same arguments (cmd is included to + * their respective circumstances unless their value is "lkm_nullcmd". + * If called, they are called with the same arguments (cmd is included to * allow the use of a single function, ver is included for version * matching between modules and the kernel loader for the modules). * @@ -232,7 +232,7 @@ pcic_handle(struct lkm_table *lkmtp, int cmd) int pcic_mod(struct lkm_table *lkmtp, int cmd, int ver) { - DISPATCH(lkmtp,cmd,ver,pcic_handle,pcic_handle,nosys) + DISPATCH(lkmtp,cmd,ver,pcic_handle,pcic_handle,lkm_nullcmd); } /* @@ -240,7 +240,7 @@ pcic_mod(struct lkm_table *lkmtp, int cmd, int ver) * Disables interrupts and resets PCIC. */ static int -pcic_unload() +pcic_unload(struct lkm_table *lkmtp, int cmd) { int slot; struct pcic_slot *sp = pcic_slots; @@ -688,8 +688,9 @@ pcic_mapirq (struct slot *slotp, int irq) */ static void -pcic_reset(struct slot *slotp) +pcic_reset(void *chan) { + struct slot *slotp = chan; struct pcic_slot *sp = slotp->cdata; switch (slotp->insert_seq) { |
