Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change rd references to md that escaped the previous change.

Browse Source 
Reformatted a few over-long source lines.
This commit is contained in:
mark 1997-01-05 18:57:04 +00:00
parent 3896082c5a
commit cd9c6d9853
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/arm32/arm32/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.11 1996/10/15 21:32:10 mark Exp $ */
/* $NetBSD: autoconf.c,v 1.12 1997/01/05 18:57:04 mark Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@ -55,7 +55,7 @@
#include "wdc.h"
#include "fdc.h"
#include "rd.h"
#include "md.h"
#include "sd.h"
#include "cd.h"
#include "podulebus.h"
@ -85,8 +85,8 @@ struct {
#if NFDC > 0
{ "fd", 0x11 },
#endif
#if NRD > 0
{ "rd", 0x12 },
#if NMD > 0
{ "md", 0x12 },
#endif
#if NSD > 0
{ "sd", 0x18 },
@ -293,9 +293,11 @@ configure()
/* Debugging information */
printf("ipl_bio=%08x ipl_net=%08x ipl_tty=%08x ipl_clock=%08x ipl_imp=%08x ipl_none=%08x\n",
printf("ipl_bio=%08x ipl_net=%08x ipl_tty=%08x ipl_clock=%08x\n",
irqmasks[IPL_BIO], irqmasks[IPL_NET], irqmasks[IPL_TTY],
irqmasks[IPL_CLOCK], irqmasks[IPL_IMP], irqmasks[IPL_NONE]);
irqmasks[IPL_CLOCK]);
printf(" ipl_imp=%08x ipl_none=%08x\n", irqmasks[IPL_IMP],
irqmasks[IPL_NONE]);
/* Time to start taking interrupts so lets open the flood gates .... */

20
sys/arch/arm32/arm32/stubs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: stubs.c,v 1.13 1997/01/01 23:40:15 pk Exp $ */
/* $NetBSD: stubs.c,v 1.14 1997/01/05 18:57:05 mark Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@ -80,7 +80,7 @@ extern videomemory_t videomemory;
#ifdef GENERIC
#include "fdc.h"
#include "rd.h"
#include "md.h"
extern dev_t rootdev;
extern int ffs_mountroot();
@ -118,7 +118,7 @@ do_mountroot()
* loading the boot memory disc which is unit 0.
*/
if (major(rootdev) == 18 && bootrd) {
if (major(rootdev) == 18 && bootmd) {
if (load_memory_disc_from_floppy(bootmd, makedev(17, minor(rootdev))) != 0)
panic("Failed to load memory disc\n");
boothowto |= RB_SINGLE;
@ -347,7 +347,8 @@ dumpsys()
if ((len % (1024*1024)) == 0)
printf("%d ", len / (1024*1024));
pmap_map(dumpspace, addr, addr + NBPG, VM_PROT_READ);
error = (*bdevsw[major(dumpdev)].d_dump)(dumpdev, blkno, (caddr_t) dumpspace, NBPG);
error = (*bdevsw[major(dumpdev)].d_dump)(dumpdev,
blkno, (caddr_t) dumpspace, NBPG);
if (error) break;
blkno += btodb(NBPG);
len += NBPG;
@ -361,7 +362,8 @@ dumpsys()
if ((len % (1024*1024)) == 0)
printf("%d ", len / (1024*1024));
pmap_map(dumpspace, addr, addr + NBPG, VM_PROT_READ);
error = (*bdevsw[major(dumpdev)].d_dump)(dumpdev, blkno, (caddr_t) dumpspace, NBPG);
error = (*bdevsw[major(dumpdev)].d_dump)(dumpdev,
blkno, (caddr_t) dumpspace, NBPG);
if (error) break;
blkno += btodb(NBPG);
len += NBPG;
@ -416,8 +418,6 @@ beep_generate()
#endif /* NBEEP */
extern u_int spl_mask;
int current_spl_level = SPL_0;
u_int spl_masks[SPL_LEVELS];
@ -440,9 +440,11 @@ void
dump_spl_masks()
{
printf("spl0=%08x splsoft=%08x splbio=%08x splnet=%08x\n",
spl_masks[SPL_0], spl_masks[SPL_SOFT], spl_masks[SPL_BIO], spl_masks[SPL_NET]);
spl_masks[SPL_0], spl_masks[SPL_SOFT], spl_masks[SPL_BIO],
spl_masks[SPL_NET]);
printf("spltty=%08x splclock=%08x splimp=%08x splhigh=%08x\n",
spl_masks[SPL_TTY], spl_masks[SPL_CLOCK], spl_masks[SPL_IMP], spl_masks[SPL_HIGH]);
spl_masks[SPL_TTY], spl_masks[SPL_CLOCK], spl_masks[SPL_IMP],
spl_masks[SPL_HIGH]);
}
/* End of stubs.c */