From owner-freebsd-hackers Fri Jan 6 21:31:58 1995 Return-Path: hackers-owner Received: (from root@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id VAA16648 for hackers-outgoing; Fri, 6 Jan 1995 21:31:58 -0800 Received: from ns.gte.com (ns.gte.com [132.197.8.9]) by freefall.cdrom.com (8.6.9/8.6.6) with SMTP id VAA16642 for ; Fri, 6 Jan 1995 21:31:57 -0800 Received: from bunny.gte.com by ns.gte.com (5.65c/IDA-1.4.4) id AA20740; Sat, 7 Jan 1995 00:29:48 -0500 Received: by bunny.gte.com (8.6.9/GTEL2.19) id AAA01589; Sat, 7 Jan 1995 00:31:06 -0500 Received: from localhost by genesis.nred.ma.us (8.3/genesis0.0) id XAA02772; Fri, 6 Jan 1995 23:38:17 -0800 Date: Fri, 6 Jan 1995 23:38:17 -0800 From: steve2@genesis.nred.ma.us (Steve Gerakines) Message-Id: <199501070738.XAA02772@genesis.nred.ma.us> To: freebsd-hackers@freebsd.org Subject: 24F commit needed Sender: hackers-owner@freebsd.org Precedence: bulk Could someone please commit the following change to the 24F driver? Apparently some cards have trouble reading xC86 and this causes the probe to fail. The check to see if the card is in ISA mode is not really necessary. Also, someone built a special boot disk with some debugging code for a Gary Jackson that was having trouble. Could this someone build another boot disk once the patch is applied? This should take care of his booting problems. I'd do it myself but I'm not running 2.0 yet. Thanks, - Steve steve2@genesis.nred.ma.us ---- snip snip snip snip ---- *** ultra14f.c.2 Thu Nov 10 01:18:29 1994 --- ultra14f.c Fri Jan 6 23:25:46 1995 *************** *** 921,928 **** uha24_init(unit) int unit; { ! unsigned char p0, p1, p2, p3, p5, p6, p7; ! unsigned char id[7], rev, emu, haid; int slot, port, irq, i; int resetcount = 4000; struct uha_data *uha = uhadata[unit]; --- 921,928 ---- uha24_init(unit) int unit; { ! unsigned char p0, p1, p2, p3, p5, p7; ! unsigned char id[7], rev, haid; int slot, port, irq, i; int resetcount = 4000; struct uha_data *uha = uhadata[unit]; *************** *** 988,999 **** /* We have the card! Grab remaining config. */ p5 = inb(ur->config); - p6 = inb(ur->config+1); p7 = inb(ur->config+2); - - /* If the 24F is currently emulating an ISA device, leave. */ - emu = ((p6 & 0x04) >> 1) | ((p5 & 0x08) >> 3); - if (emu != 3) return(ENODEV); switch (p5 & 0xf0) { case 0x10: irq = 15; break; --- 988,994 ---- ---- EOF EOF EOF EOF ----