From owner-freebsd-bugs@FreeBSD.ORG Sat Aug 16 12:10:04 2008 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC56D106564A for ; Sat, 16 Aug 2008 12:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A7F0D8FC08 for ; Sat, 16 Aug 2008 12:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GCA4G7055432 for ; Sat, 16 Aug 2008 12:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7GCA4uh055431; Sat, 16 Aug 2008 12:10:04 GMT (envelope-from gnats) Date: Sat, 16 Aug 2008 12:10:04 GMT Message-Id: <200808161210.m7GCA4uh055431@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org From: Gavin Atkinson Cc: Subject: Re: kern/116538: [fdc] [patch] reintroduce FD_NO_CHLINE flag for fdc(4) X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Gavin Atkinson List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 12:10:04 -0000 The following reply was made to PR kern/116538; it has been noted by GNATS. From: Gavin Atkinson To: bug-followup@FreeBSD.org Cc: Eugene Grosbein Subject: Re: kern/116538: [fdc] [patch] reintroduce FD_NO_CHLINE flag for fdc(4) Date: Sat, 16 Aug 2008 13:08:04 +0100 (BST) Can you try this patch please? Index: src/sys/dev/fdc/fdc.c =================================================================== RCS file: /home/ncvs/src/sys/dev/fdc/fdc.c,v retrieving revision 1.320 diff -u -r1.320 fdc.c --- src/sys/dev/fdc/fdc.c 11 Jan 2008 16:50:52 -0000 1.320 +++ src/sys/dev/fdc/fdc.c 16 Aug 2008 12:02:13 -0000 @@ -97,6 +97,8 @@ * fd_drivetype; on i386 machines, if * given as 0, use RTC type for fd0 * and fd1 */ +#define FD_NO_CHLINE 0x10 /* drive does not support changeline + * aka. unit attention */ #define FD_NO_PROBE 0x20 /* don't probe drive (seek test), just * assume it is there */ @@ -837,7 +839,8 @@ if (bp->bio_cmd & BIO_PROBE) { - if (!(fdin_rd(fdc) & FDI_DCHG) && !(fd->flags & FD_EMPTY)) + if (!(device_get_flags(fd->dev) & FD_NO_CHLINE) && + !(fdin_rd(fdc) & FDI_DCHG) && !(fd->flags & FD_EMPTY)) return (fdc_biodone(fdc, 0)); /*