diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 1999-01-11 05:12:41 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 1999-01-11 05:12:41 +0000 |
commit | b3067fd524234e263e58b215d0fb24d414bf1c34 (patch) | |
tree | 5c1576265dded5700ab387af81051fabd39f3396 /sys/arch/arm32/mainbus | |
parent | 9ee95b4b405b050512cf782b508d774f4601a6b5 (diff) |
panic prints a newline for you, don't do it in the panic string
Diffstat (limited to 'sys/arch/arm32/mainbus')
-rw-r--r-- | sys/arch/arm32/mainbus/beep.c | 6 | ||||
-rw-r--r-- | sys/arch/arm32/mainbus/com.c | 2 | ||||
-rw-r--r-- | sys/arch/arm32/mainbus/fd.c | 12 | ||||
-rw-r--r-- | sys/arch/arm32/mainbus/kbd.c | 2 | ||||
-rw-r--r-- | sys/arch/arm32/mainbus/lpt.c | 2 | ||||
-rw-r--r-- | sys/arch/arm32/mainbus/pms.c | 6 | ||||
-rw-r--r-- | sys/arch/arm32/mainbus/qmouse.c | 4 | ||||
-rw-r--r-- | sys/arch/arm32/mainbus/vidcaudio.c | 2 | ||||
-rw-r--r-- | sys/arch/arm32/mainbus/wd.c | 10 |
9 files changed, 23 insertions, 23 deletions
diff --git a/sys/arch/arm32/mainbus/beep.c b/sys/arch/arm32/mainbus/beep.c index 762830309f5..fd4adaa3ea6 100644 --- a/sys/arch/arm32/mainbus/beep.c +++ b/sys/arch/arm32/mainbus/beep.c @@ -137,9 +137,9 @@ beepattach(parent, self, aux) sc->sc_buffer0 = kmem_alloc(kernel_map, NBPG); if (sc->sc_buffer0 == 0) - panic("beep: Cannot allocate buffer memory\n"); + panic("beep: Cannot allocate buffer memory"); if ((sc->sc_buffer0 & (NBPG -1)) != 0) - panic("beep: Cannot allocate page aligned buffer\n"); + panic("beep: Cannot allocate page aligned buffer"); sc->sc_buffer1 = sc->sc_buffer0; sc->sc_sound_cur0 = pmap_extract(kernel_pmap, @@ -168,7 +168,7 @@ beepattach(parent, self, aux) sc->sc_ih.ih_name = "dma snd ch 0"; if (irq_claim(IRQ_DMASCH0, &sc->sc_ih)) - panic("Cannot claim DMASCH0 IRQ for beep%d\n", parent->dv_unit); + panic("Cannot claim DMASCH0 IRQ for beep%d", parent->dv_unit); disable_irq(IRQ_DMASCH0); diff --git a/sys/arch/arm32/mainbus/com.c b/sys/arch/arm32/mainbus/com.c index ee9b812f796..a22a93c076c 100644 --- a/sys/arch/arm32/mainbus/com.c +++ b/sys/arch/arm32/mainbus/com.c @@ -232,7 +232,7 @@ comattach(parent, self, aux) sc->sc_ih.ih_name = "serial"; if (mb->mb_irq != IRQUNK) if (irq_claim(mb->mb_irq, &sc->sc_ih)) - panic("Cannot claim IRQ %d for com%d\n", mb->mb_irq, sc->sc_dev.dv_unit); + panic("Cannot claim IRQ %d for com%d", mb->mb_irq, sc->sc_dev.dv_unit); #ifdef KGDB if (kgdb_dev == makedev(commajor, unit)) { diff --git a/sys/arch/arm32/mainbus/fd.c b/sys/arch/arm32/mainbus/fd.c index db8316cf288..efdca4fc236 100644 --- a/sys/arch/arm32/mainbus/fd.c +++ b/sys/arch/arm32/mainbus/fd.c @@ -328,7 +328,7 @@ fdcattach(parent, self, aux) fdc->sc_ih.ih_level = IPL_BIO; fdc->sc_ih.ih_name = "fdc"; if (irq_claim(mb->mb_irq, &fdc->sc_ih)) - panic("Cannot claim IRQ %d for fdc%d\n", mb->mb_irq, parent->dv_unit); + panic("Cannot claim IRQ %d for fdc%d", mb->mb_irq, parent->dv_unit); /* * The NVRAM info only tells us about the first two disks on the @@ -973,7 +973,7 @@ loop: fiqhandler.fh_r13 = fdc->sc_drq; fiqhandler.fh_mask = 0x01; if (fiq_claim(&fiqhandler) == -1) - panic("Cannot claim FIQ vector\n"); + panic("Cannot claim FIQ vector"); outb(iobase + fdctl, type->rate); #ifdef FD_DEBUG @@ -1026,7 +1026,7 @@ loop: isa_dmaabort(fdc->sc_drq); #endif*/ if (fiq_release(&fiqhandler) == -1) - panic("Cannot release FIQ vector\n"); + panic("Cannot release FIQ vector"); case SEEKTIMEDOUT: case RECALTIMEDOUT: case RESETTIMEDOUT: @@ -1042,7 +1042,7 @@ loop: isa_dmaabort(fdc->sc_drq); #endif*/ if (fiq_release(&fiqhandler) == -1) - panic("Cannot release FIQ vector\n"); + panic("Cannot release FIQ vector"); #ifdef FD_DEBUG fdcstatus(&fd->sc_dev, 7, bp->b_flags & B_READ ? "read failed" : "write failed"); @@ -1060,7 +1060,7 @@ loop: fdc->sc_drq); #endif*/ if (fiq_release(&fiqhandler) == -1) - panic("Cannot release FIQ vector\n"); + panic("Cannot release FIQ vector"); if (fdc->sc_errors) { /* diskerr(bp, "fd", "soft error", LOG_PRINTF, @@ -1319,7 +1319,7 @@ load_ramdisc_from_floppy(rd, dev) fdstrategy(bp); if (biowait(bp)) - panic("Cannot load floppy image\n"); + panic("Cannot load floppy image"); bcopy((caddr_t)bp->b_data, (caddr_t)rd->rd_addr + loop * fd_types[type].sectrac * DEV_BSIZE, diff --git a/sys/arch/arm32/mainbus/kbd.c b/sys/arch/arm32/mainbus/kbd.c index 3b85bdba7e8..5dd3ea7ce86 100644 --- a/sys/arch/arm32/mainbus/kbd.c +++ b/sys/arch/arm32/mainbus/kbd.c @@ -902,7 +902,7 @@ kbdinit(sc) sc->sc_ih.ih_level = IPL_TTY; sc->sc_ih.ih_name = "kbd rx"; if (irq_claim(IRQ_KBDRX, &sc->sc_ih)) - panic("Cannot claim IRQ for kbd%d\n", sc->sc_device.dv_unit); + panic("Cannot claim IRQ for kbd%d", sc->sc_device.dv_unit); modifiers = 0; kbdsetleds((modifiers >> 3) & 7); diff --git a/sys/arch/arm32/mainbus/lpt.c b/sys/arch/arm32/mainbus/lpt.c index 35ff77c3f0d..f379e3a60e3 100644 --- a/sys/arch/arm32/mainbus/lpt.c +++ b/sys/arch/arm32/mainbus/lpt.c @@ -324,7 +324,7 @@ lptattach(parent, self, aux) sc->sc_ih.ih_name = "lpt"; #endif if (irq_claim(mb->mb_irq, &sc->sc_ih)) - panic("Cannot claim IRQ %d for lpt%d\n", mb->mb_irq, sc->sc_dev.dv_unit); + panic("Cannot claim IRQ %d for lpt%d", mb->mb_irq, sc->sc_dev.dv_unit); } #if defined(INET) && defined(PLIP) diff --git a/sys/arch/arm32/mainbus/pms.c b/sys/arch/arm32/mainbus/pms.c index 8339e1ab8a0..8789074800d 100644 --- a/sys/arch/arm32/mainbus/pms.c +++ b/sys/arch/arm32/mainbus/pms.c @@ -267,7 +267,7 @@ pmsattach(parent, self, aux) #ifdef RC7500 sc->sc_ih.ih_num = IRQ_MSDRX; #else - panic("pms: No IRQ specified for pms interrupt handler\n"); + panic("pms: No IRQ specified for pms interrupt handler"); #endif } @@ -302,7 +302,7 @@ pmsopen(dev, flag, mode, p) sc->lastb = -1; if (irq_claim(IRQ_INSTRUCT, &sc->sc_ih) == -1) - panic("Cannot claim MOUSE IRQ\n"); + panic("Cannot claim MOUSE IRQ"); return 0; } @@ -317,7 +317,7 @@ pmsclose(dev, flag, mode, p) struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)]; if (irq_release(IRQ_INSTRUCT, &sc->sc_ih) != 0) - panic("Cannot release MOUSE IRQ\n"); + panic("Cannot release MOUSE IRQ"); sc->proc = NULL; sc->sc_state &= ~PMS_OPEN; diff --git a/sys/arch/arm32/mainbus/qmouse.c b/sys/arch/arm32/mainbus/qmouse.c index b2a6447a073..14842236425 100644 --- a/sys/arch/arm32/mainbus/qmouse.c +++ b/sys/arch/arm32/mainbus/qmouse.c @@ -203,7 +203,7 @@ quadmouseopen(dev, flag, mode, p) WriteByte(IOMD_T1GO, 0); if (irq_claim(IRQ_TIMER1, &sc->sc_ih)) - panic("Cannot claim TIMER1 IRQ for quadmouse%d\n", sc->sc_device.dv_unit); + panic("Cannot claim TIMER1 IRQ for quadmouse%d", sc->sc_device.dv_unit); return(0); } @@ -220,7 +220,7 @@ quadmouseclose(dev, flag, mode, p) struct quadmouse_softc *sc = quadmouse_cd.cd_devs[unit]; if (irq_release(IRQ_TIMER1, &sc->sc_ih) != 0) - panic("Cannot release IRA\n"); + panic("Cannot release IRA"); sc->proc = NULL; sc->sc_state = 0; diff --git a/sys/arch/arm32/mainbus/vidcaudio.c b/sys/arch/arm32/mainbus/vidcaudio.c index 0529519a9b4..dc215efa31f 100644 --- a/sys/arch/arm32/mainbus/vidcaudio.c +++ b/sys/arch/arm32/mainbus/vidcaudio.c @@ -204,7 +204,7 @@ vidcaudio_attach(parent, self, aux) ag.silence = kmem_alloc(kernel_map, NBPG); if (ag.silence == NULL) - panic("vidcaudio: Cannot allocate memory\n"); + panic("vidcaudio: Cannot allocate memory"); bzero((char *)ag.silence, NBPG); bcopy((char *)beep_waveform, (char *)ag.silence, sizeof(beep_waveform)); diff --git a/sys/arch/arm32/mainbus/wd.c b/sys/arch/arm32/mainbus/wd.c index 04b78437d28..c1540197729 100644 --- a/sys/arch/arm32/mainbus/wd.c +++ b/sys/arch/arm32/mainbus/wd.c @@ -263,7 +263,7 @@ wdcattach(parent, self, aux) wdc->sc_ih.ih_level = IPL_BIO; wdc->sc_ih.ih_name = "wdc"; if (irq_claim(mb->mb_irq, &wdc->sc_ih)) - panic("Cannot claim IRQ %d for wdc%d\n", mb->mb_irq, parent->dv_unit); + panic("Cannot claim IRQ %d for wdc%d", mb->mb_irq, parent->dv_unit); for (wa.wa_drive = 0; wa.wa_drive < 2; wa.wa_drive++) (void)config_found(self, (void *)&wa, wdprint); @@ -680,7 +680,7 @@ loop: /* isa_dmastart(bp->b_flags & B_READ, bp->b_data + wd->sc_skip, wd->sc_nbytes, wdc->sc_drq);*/ - panic("wd cannot do DMA yet\n"); + panic("wd cannot do DMA yet"); break; case WDM_PIOMULTI: command = (bp->b_flags & B_READ) ? @@ -727,7 +727,7 @@ loop: outsw(wdc->sc_iobase+wd_data, (u_int) bp->b_data + wd->sc_skip, wd->sc_nbytes >> 1); else - panic("wd cannot do 32 bit transfers\n"); + panic("wd cannot do 32 bit transfers"); /* outsl(wdc->sc_iobase+wd_data, bp->b_data + wd->sc_skip, wd->sc_nbytes >> 2);*/ } @@ -783,7 +783,7 @@ wdcintr(arg) /* Turn off the DMA channel and unbounce the buffer. */ if (wd->sc_mode == WDM_DMA) - panic("wd cannot do DMA\n"); + panic("wd cannot do DMA"); /* isa_dmadone(bp->b_flags & B_READ, bp->b_data + wd->sc_skip, wd->sc_nbytes, wdc->sc_drq);*/ @@ -828,7 +828,7 @@ wdcintr(arg) insw(wdc->sc_iobase+wd_data, (u_int) bp->b_data + wd->sc_skip, wd->sc_nbytes >> 1); else - panic("wd cannot do 32 bit transfers\n"); + panic("wd cannot do 32 bit transfers"); /* insl(wdc->sc_iobase+wd_data, bp->b_data + wd->sc_skip, wd->sc_nbytes >> 2);*/ } |