From owner-freebsd-current@FreeBSD.ORG Tue Nov 4 11:42:50 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B813D16A4CE; Tue, 4 Nov 2003 11:42:50 -0800 (PST) Received: from kartoffel.salatschuessel.net (pD9E21C72.dip.t-dialin.net [217.226.28.114]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0890743FE5; Tue, 4 Nov 2003 11:42:48 -0800 (PST) (envelope-from lehmann@ans-netz.de) Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1]) hA4JgkSx004399; Tue, 4 Nov 2003 20:42:46 +0100 (CET) (envelope-from lehmann@ans-netz.de) Date: Tue, 4 Nov 2003 20:42:46 +0100 From: Oliver Lehmann To: alpha@freebsd.org Message-Id: <20031104204246.3c45d326.lehmann@ans-netz.de> In-Reply-To: <20031104190230.7ebf3bc5.lehmann@ans-netz.de> References: <20031103210959.58d4afc1.lehmann@ans-netz.de> <20031104184704.1327aff2.lehmann@ans-netz.de> <20031104190230.7ebf3bc5.lehmann@ans-netz.de> X-Mailer: Sylpheed version 0.9.7 (GTK+ 1.2.10; i386-portbld-freebsd4.8) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart=_Tue__4_Nov_2003_20_42_46_+0100_bln_tMrXK2ZgQ2vn" cc: current@freebsd.org cc: joerg@freebsd.org Subject: Re: Floppy drive not found by RELENG_5_1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2003 19:42:50 -0000 This is a multi-part message in MIME format. --Multipart=_Tue__4_Nov_2003_20_42_46_+0100_bln_tMrXK2ZgQ2vn Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Ok, to get back a working and floppydrive detection on FreeBSD/alpha: What's about the attached patch? I moved in fd_probe() if (fd->type == FDT_NONE && (fd->fdu == 0 || fd->fdu == 1)) { out of the #if defined(__i386__) || defined(__amd64__) block and created an #else section (like it was in RELENG_4) where the fd->type is set to 144 by force. Why not just re-create the #else block? Why moving the if statement out of the #ifdef block? Doing it that way, it's still possible to set hint.fd.0.flags for example to 3 (720KB Floppy), and only set the 1.44M type as a fallback when flags is NULL (FDT_NONE) which means in that case, hint.fd.0.flags isn't defined. (Because we don't query the "BIOS" as we do it for x86 to get the info what kind of floppy is attached to fdc.) Greetings, Oliver -- Oliver Lehmann @home: lehmann@ans-netz.de @office: oliver.lehmann@mgi.de @www: http://www.pofo.de/ | http://wishlist.ans-netz.de/ --Multipart=_Tue__4_Nov_2003_20_42_46_+0100_bln_tMrXK2ZgQ2vn Content-Type: application/octet-stream; name="src::sys::isa::fd.c" Content-Disposition: attachment; filename="src::sys::isa::fd.c" Content-Transfer-Encoding: base64 LS0tIHNyYy9zeXMvaXNhL2ZkLmMub3JpZwlUaHUgT2N0IDIzIDA3OjUyOjUyIDIwMDMKKysrIHNy Yy9zeXMvaXNhL2ZkLmMJVHVlIE5vdiAgNCAyMDowNToxMyAyMDAzCkBAIC0xMjA0LDYgKzEyMDQs OCBAQAogCWZkLT5mbGFncyA9IEZEX1VBOwkvKiBtYWtlIHN1cmUgZmRhdXRvc2VsZWN0KCkgd2ls bCBiZSBjYWxsZWQgKi8KIAogCWZkLT50eXBlID0gRkRfRFRZUEUoZmxhZ3MpOworCisJaWYgKGZk LT50eXBlID09IEZEVF9OT05FICYmIChmZC0+ZmR1ID09IDAgfHwgZmQtPmZkdSA9PSAxKSkgewog LyoKICAqIFhYWCBJIHRoaW5rIHVzaW5nIF9faTM4Nl9fIGlzIHdyb25nIGhlcmUgc2luY2Ugd2Ug YWN0dWFsbHkgd2FudCB0byBwcm9iZQogICogZm9yIHRoZSBtYWNoaW5lIHR5cGUsIG5vdCB0aGUg Q1BVIHR5cGUgKHNvIG5vbi1QQyBhcmNoJ3MgbGlrZSB0aGUgUEM5OCB3aWxsCkBAIC0xMjExLDcg KzEyMTMsNiBAQAogICogPT0gaTM4NiBicmVha3MgdGhlIHRlc3Qgb24gRnJlZUJTRC9BbHBoYS4K ICAqLwogI2lmIGRlZmluZWQoX19pMzg2X18pIHx8IGRlZmluZWQoX19hbWQ2NF9fKQotCWlmIChm ZC0+dHlwZSA9PSBGRFRfTk9ORSAmJiAoZmQtPmZkdSA9PSAwIHx8IGZkLT5mZHUgPT0gMSkpIHsK IAkJLyogTG9vayB1cCB3aGF0IHRoZSBCSU9TIHRoaW5rcyB3ZSBoYXZlLiAqLwogCQlpZiAoZmQt PmZkdSA9PSAwKSB7CiAJCQlpZiAoKGZkYy0+ZmxhZ3MgJiBGRENfSVNQQ01DSUEpKQpAQCAtMTIy OSw4ICsxMjMwLDExIEBACiAJCX0KIAkJaWYgKGZkLT50eXBlID09IEZEVF8yODhNXzEpCiAJCQlm ZC0+dHlwZSA9IEZEVF8yODhNOwotCX0KKyNlbHNlCisJCWZkLT50eXBlID0gRkRUXzE0NE07CiAj ZW5kaWYgLyogX19pMzg2X18gfHwgX19hbWQ2NF9fICovCisJfQorCiAJLyogaXMgdGhlcmUgYSB1 bml0PyAqLwogCWlmIChmZC0+dHlwZSA9PSBGRFRfTk9ORSkKIAkJcmV0dXJuIChFTlhJTyk7Cg== --Multipart=_Tue__4_Nov_2003_20_42_46_+0100_bln_tMrXK2ZgQ2vn--