upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor formatting changes. No functional differences, but makes the

Browse source 
style more consistant with KNF and the Nomad release.
This commit is contained in:
Nate Williams 1996-06-05 05:30:09 +00:00
parent ddc0f71085
commit 439a59dd6e
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/pccard/cis.h
View file

@ -1,4 +1,3 @@
/*
* PCMCIA card structures and defines.
* These defines relate to the user level

32
sys/pccard/pccard.c
View file

@ -47,9 +47,6 @@
#include <sys/devfsext.h>
#endif /*DEVFS*/
#include <machine/clock.h>
#include <machine/laptops.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/icu.h>
@ -63,6 +60,9 @@
#include <pccard/driver.h>
#include <pccard/slot.h>
#include <machine/clock.h>
#include <machine/laptops.h>
extern struct kern_devconf kdc_cpu0;
struct kern_devconf kdc_pccard0 = {
@ -321,8 +321,8 @@ disable_slot(struct slot *sp)
splx(s);
}
}
/* Power off the slot. */
timeout(power_off_slot, (caddr_t)sp, hz / 4);
/* Power off the slot 1/2 second after remove of the card */
timeout(power_off_slot, (caddr_t)sp, hz / 2);
sp->pwr_off_pending = 1;
/* De-activate all contexts. */
@ -366,7 +366,7 @@ slot_resume(void *arg)
if (sp->irq)
sp->ctrl->mapirq(sp, sp->irq);
for (dp = sp->devices; dp; dp = dp->next)
(void) dp->drv->init(dp, 0);
(void) dp->drv->init(dp, 0);
return (0);
}
#endif /* NAPM > 0 */
@ -654,7 +654,7 @@ static void enable_beep(void *dummy)
void
pccard_event(struct slot *sp, enum card_event event)
{
int s;
int s;
if (sp->insert_seq) {
sp->insert_seq = 0;
@ -672,10 +672,9 @@ int s;
sp->state = empty;
splx(s);
printf("Card removed, slot %d\n", sp->slot);
if (beepok) {
if (beepok)
sysbeep(PCCARD_BEEP_PITCH0, PCCARD_BEEP_DURATION0);
beepok = 0;
}
beepok = 0;
timeout(enable_beep, (void *)NULL, hz/5);
selwakeup(&sp->selp);
}
@ -683,10 +682,9 @@ int s;
case card_inserted:
sp->insert_seq = 1;
timeout(inserted, (void *)sp, hz/4);
if (beepok) {
if (beepok)
sysbeep(PCCARD_BEEP_PITCH0, PCCARD_BEEP_DURATION0);
beepok = 0;
}
beepok = 0;
timeout(enable_beep, (void *)NULL, hz/5);
break;
}
@ -712,13 +710,13 @@ slot_irq_handler(int sp)
((struct slot *)sp)->slot, ((struct slot *)sp)->irq);
}
/*
* Device driver interface.
*/
/*
* Device driver interface.
*/
static int
crdopen(dev_t dev, int oflags, int devtype, struct proc *p)
{
struct slot *sp;
struct slot *sp;
if (minor(dev) >= MAXSLOT)
return(ENXIO);