diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-03-14 10:47:37 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-03-14 10:47:37 +0000 |
| commit | a3c761c79ca4ae6249b11bec199a391763ea4111 (patch) | |
| tree | c71bce2211417d700156398d9936c7f1683dd36c | |
| parent | 1a817cd09fcf441335ed3a891ceb84515b8c9d8c (diff) | |
spl police.
| -rw-r--r-- | sys/arch/mac68k/dev/adb_direct.c | 6 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/mac68k5380.c | 3 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/ncr5380.c | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/pm_direct.c | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/sys/arch/mac68k/dev/adb_direct.c b/sys/arch/mac68k/dev/adb_direct.c index ff56727b03d..6ac6c9c553e 100644 --- a/sys/arch/mac68k/dev/adb_direct.c +++ b/sys/arch/mac68k/dev/adb_direct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb_direct.c,v 1.11 2002/03/14 01:26:35 millert Exp $ */ +/* $OpenBSD: adb_direct.c,v 1.12 2003/03/14 10:47:36 miod Exp $ */ /* $NetBSD: adb_direct.c,v 1.5 1997/04/21 18:04:28 scottr Exp $ */ /* From: adb_direct.c 2.02 4/18/97 jpw */ @@ -1666,8 +1666,6 @@ adb_reinit(void) int nonewtimes; /* times thru loop w/o any new devices */ ADBDataBlock data; /* temp. holder for getting device info */ - (void)(&s); /* work around lame GCC bug */ - /* Make sure we are not interrupted while building the table. */ if (adbHardware != ADB_HW_PB) /* ints must be on for PB? */ s = splhigh(); @@ -1739,8 +1737,8 @@ adb_reinit(void) default: via_reg(VIA1, vIER) = 0x04; /* turn interrupts off - TO * DO: turn PB ints off? */ + splx(s); return; - break; } /* diff --git a/sys/arch/mac68k/dev/mac68k5380.c b/sys/arch/mac68k/dev/mac68k5380.c index afecbb42f2e..ca239678d05 100644 --- a/sys/arch/mac68k/dev/mac68k5380.c +++ b/sys/arch/mac68k/dev/mac68k5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mac68k5380.c,v 1.16 2002/10/13 18:26:12 krw Exp $ */ +/* $OpenBSD: mac68k5380.c,v 1.17 2003/03/14 10:47:36 miod Exp $ */ /* $NetBSD: mac68k5380.c,v 1.29 1997/02/28 15:50:50 scottr Exp $ */ /* @@ -639,6 +639,7 @@ scsi_timeout_error: * Clear the DMA mode. */ SET_5380_REG(NCR5380_MODE, GET_5380_REG(NCR5380_MODE) & ~SC_M_DMA); + splx(s); return -1; } #endif /* if USE_PDMA */ diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c index 22777cdb5d7..e1977810a84 100644 --- a/sys/arch/mac68k/dev/ncr5380.c +++ b/sys/arch/mac68k/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380.c,v 1.20 2003/02/26 22:59:13 miod Exp $ */ +/* $OpenBSD: ncr5380.c,v 1.21 2003/03/14 10:47:36 miod Exp $ */ /* $NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $ */ /* @@ -187,11 +187,11 @@ extern __inline__ void finish_req(SC_REQ *reqp) sps = splbio(); reqp->next = free_head; free_head = reqp; - splx(sps); xs->flags |= ITSDONE; if (!(reqp->dr_flag & DRIVER_LINKCHK)) scsi_done(xs); + splx(sps); } /* diff --git a/sys/arch/mac68k/dev/pm_direct.c b/sys/arch/mac68k/dev/pm_direct.c index 4ffc444fc7a..9602a3e5741 100644 --- a/sys/arch/mac68k/dev/pm_direct.c +++ b/sys/arch/mac68k/dev/pm_direct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pm_direct.c,v 1.5 2002/03/14 01:26:35 millert Exp $ */ +/* $OpenBSD: pm_direct.c,v 1.6 2003/03/14 10:47:36 miod Exp $ */ /* pm_direct.c 1.22 01/09/97 Takashi Hamada */ /* @@ -520,6 +520,7 @@ pm_intr_pm1(void) printf( "pm: PM is not ready. error code=%08x\n", rval ); #endif splx(s); + return; } if ((pmdata.data[2] & 0x10) == 0x10) { @@ -779,6 +780,7 @@ pm_intr_pm2(void) printf( "pm: PM is not ready. error code: %08x\n", rval ); #endif splx(s); + return; } switch( (u_int)(pmdata.data[2] & 0xff) ) { |