Subject: some kernel fixes
To: None <amiga-dev@sun-lamp.cs.berkeley.edu>
From: Andy Heffernan <ahh@netcom.com>
List: amiga-dev
Date: 06/22/1994 22:08:33
Two cosmetic fixes, plus a crash-preventer on 3000's running
the GENERIC kernel, and a fix to allow Retina 2's to be mmap()ed:
*** ./arch/amiga/amiga/disksubr.c-orig Thu May 26 03:24:46 1994
--- ./arch/amiga/amiga/disksubr.c Tue Jun 7 19:53:28 1994
***************
*** 537,543 ****
return(adt);
case DOST_XXXBSD:
#ifdef DIAGNOSTIC
! printf("found dostype: 0x%x which is depricated", dostype);
#endif
if (b1 == 'S') {
dostype = DOST_NBS;
--- 537,543 ----
return(adt);
case DOST_XXXBSD:
#ifdef DIAGNOSTIC
! printf("found dostype: 0x%x which is deprecated", dostype);
#endif
if (b1 == 'S') {
dostype = DOST_NBS;
*** ./arch/amiga/dev/sbic.c-orig Tue Jun 21 03:20:58 1994
--- ./arch/amiga/dev/sbic.c Tue Jun 21 23:03:29 1994
***************
*** 1362,1368 ****
* check for overlapping cache line, flush if so
*/
#ifdef M68040
! if (dev->sc_flags & SBICF_DCFLUSH) {
df = dev->sc_chain;
dl = dev->sc_last;
DCFL(df->dc_addr);
--- 1362,1368 ----
* check for overlapping cache line, flush if so
*/
#ifdef M68040
! if (cpu040 && dev->sc_flags & SBICF_DCFLUSH) {
df = dev->sc_chain;
dl = dev->sc_last;
DCFL(df->dc_addr);
***************
*** 1408,1414 ****
* check for overlapping cache line, flush if so
*/
#ifdef M68040
! if (dev->sc_flags & SBICF_DCFLUSH) {
df = dev->sc_chain;
dl = dev->sc_last;
DCFL(df->dc_addr);
--- 1408,1414 ----
* check for overlapping cache line, flush if so
*/
#ifdef M68040
! if (cpu040 && dev->sc_flags & SBICF_DCFLUSH) {
df = dev->sc_chain;
dl = dev->sc_last;
DCFL(df->dc_addr);
*** ./arch/amiga/dev/grf_rt.c-orig Thu Jun 16 03:20:22 1994
--- ./arch/amiga/dev/grf_rt.c Wed Jun 22 19:44:54 1994
***************
*** 710,719 ****
}
gp->g_data = (caddr_t)md;
! gi->gd_regaddr = (caddr_t)ztwomap(ba);
gi->gd_regsize = 64*1024;
! gi->gd_fbaddr = (caddr_t)ztwomap(fb);
#ifdef BANKEDDEVPAGER
gi->gd_fbsize = 4*1024*1024; /* XXX */
gi->gd_bank_size = 64*1024;
--- 710,719 ----
}
gp->g_data = (caddr_t)md;
! gi->gd_regaddr = (caddr_t)ztwopa(ba);
gi->gd_regsize = 64*1024;
! gi->gd_fbaddr = (caddr_t)ztwopa(fb);
#ifdef BANKEDDEVPAGER
gi->gd_fbsize = 4*1024*1024; /* XXX */
gi->gd_bank_size = 64*1024;
*** ./arch/amiga/dev/ite.c-orig Fri Jun 17 03:13:37 1994
--- ./arch/amiga/dev/ite.c Sat Jun 18 00:03:54 1994
***************
*** 173,179 ****
iteinit(gp->g_itedev);
printf(": rows %d cols %d", ip->rows, ip->cols);
! printf(" repeat at (%d/100)s next at (%d/100)s\n",
start_repeat_timeo, next_repeat_timeo);
if (kbd_ite == NULL)
--- 173,179 ----
iteinit(gp->g_itedev);
printf(": rows %d cols %d", ip->rows, ip->cols);
! printf(" repeat at (%d/100)s next at (%d/100)s",
start_repeat_timeo, next_repeat_timeo);
if (kbd_ite == NULL)
------------------------------------------------------------------------------