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

Reserved 8k at top of memory for ROM. This fixes warp9c boot problems. 

changed ethernet panic to a warning when out of DMA buffers.  This allows
resuming if you sit in ddb too long.
This commit is contained in:
dbj 1998-07-11 07:06:16 +00:00
parent bc4c0a9fa8
commit 1e54ab4262
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arch/next68k/dev/mb8795.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mb8795.c,v 1.5 1998/07/05 06:49:07 jonathan Exp $ */ /* $NetBSD: mb8795.c,v 1.6 1998/07/11 07:06:16 dbj Exp $ */
/* /*
* Copyright (c) 1998 Darrin B. Jewell * Copyright (c) 1998 Darrin B. Jewell
* All rights reserved. * All rights reserved.
@ -741,7 +741,12 @@ mb8795_start(ifp)
u_char txstat; u_char txstat;
txstat = bus_space_read_1(sc->sc_bst,sc->sc_bsh, XE_TXSTAT); txstat = bus_space_read_1(sc->sc_bst,sc->sc_bsh, XE_TXSTAT);
if (!(txstat & XE_TXSTAT_READY)) { if (!(txstat & XE_TXSTAT_READY)) {
panic("%s: transmitter not ready\n", sc->sc_dev.dv_xname); /* @@@ I used to panic here, but then it paniced once.
* Let's see if I can just reset instead. [ dbj 980706.1900 ]
*/
printf("%s: transmitter not ready\n", sc->sc_dev.dv_xname);
mb8795_reset(sc);
return;
} }
} }
#endif #endif
@ -1044,7 +1049,7 @@ mb8795_rxdma_continue(arg)
} }
#if (defined(DIAGNOSTIC)) #if (defined(DIAGNOSTIC))
else { else {
panic("%s: out of receive DMA buffers\n",sc->sc_dev.dv_xname); printf("%s: out of receive DMA buffers\n",sc->sc_dev.dv_xname);
} }
#endif #endif

6
sys/arch/next68k/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.2 1998/07/04 22:18:33 jonathan Exp $ */ /* $NetBSD: zs.c,v 1.3 1998/07/11 07:06:16 dbj Exp $ */
/*- /*-
* Copyright (c) 1996 The NetBSD Foundation, Inc. * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -91,7 +91,11 @@ int zs_major = 12;
/* /*
* The NeXT provides a 3.686400 MHz clock to the ZS chips. * The NeXT provides a 3.686400 MHz clock to the ZS chips.
*/ */
#if 1
#define PCLK (57600*4*16) /* PCLK pin input clock rate */ #define PCLK (57600*4*16) /* PCLK pin input clock rate */
#else
#define PCLK 10000000
#endif
#define ZS_DELAY() delay(2) #define ZS_DELAY() delay(2)

9
sys/arch/next68k/next68k/nextrom.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nextrom.c,v 1.3 1998/07/04 05:36:05 dbj Exp $ */ /* $NetBSD: nextrom.c,v 1.4 1998/07/11 07:06:17 dbj Exp $ */
/* /*
* Copyright (c) 1998 Darrin B. Jewell * Copyright (c) 1998 Darrin B. Jewell
* All rights reserved. * All rights reserved.
@ -38,7 +38,6 @@
void next68k_bootargs __P((unsigned char *args[])); void next68k_bootargs __P((unsigned char *args[]));
void dbj_message __P((char * s));
int mon_getc(void); int mon_getc(void);
int mon_putc(int c); int mon_putc(int c);
@ -153,6 +152,12 @@ next68k_bootargs(args)
j++; j++;
} }
} }
/* The NeXT ROM or something appears to reserve the very
* top of memory
*/
RELOC(phys_seg_list[j-1].ps_end, vm_offset_t) -= 0x2000;
/* pmap is unhappy if it is not null terminated */ /* pmap is unhappy if it is not null terminated */
for(;j<MAX_PHYS_SEGS;j++) { for(;j<MAX_PHYS_SEGS;j++) {
RELOC(phys_seg_list[j].ps_start, vm_offset_t) = 0; RELOC(phys_seg_list[j].ps_start, vm_offset_t) = 0;