From owner-cvs-src@FreeBSD.ORG Mon Jul 12 20:49:26 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B0DC516A4CE; Mon, 12 Jul 2004 20:49:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A958143D1D; Mon, 12 Jul 2004 20:49:26 +0000 (GMT) (envelope-from njl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6CKnQn7031543; Mon, 12 Jul 2004 20:49:26 GMT (envelope-from njl@repoman.freebsd.org) Received: (from njl@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6CKnQ6w031542; Mon, 12 Jul 2004 20:49:26 GMT (envelope-from njl) Message-Id: <200407122049.i6CKnQ6w031542@repoman.freebsd.org> From: Nate Lawson Date: Mon, 12 Jul 2004 20:49:26 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/fdc fdc.c fdc_isa.c fdc_pccard.c fdcvar.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2004 20:49:26 -0000 njl 2004-07-12 20:49:26 UTC FreeBSD src repository Modified files: sys/dev/fdc fdc.c fdc_isa.c fdc_pccard.c fdcvar.h Log: Update in preparation for adding the ACPI attachment. * Add an fdtype ivar. This will be the equivalent of fd->type. * Move enabling the FIFO to the end of attach. * Unify reset code into fdc_initial_reset(). * Add fdc_write_ivar(). * Update isa and pccard attachments accordingly. * Set the flags unconditionally in probe since they may be overridden by other probe routines. Both before and now, we're depending on probe being called a final time on the winning driver so the flags we get are the ones we intended. * Use the bus accessor macros instead of defining our own. * Remove duplicate assigns of fd->type. Revision Changes Path 1.277 +71 -45 src/sys/dev/fdc/fdc.c 1.2 +8 -11 src/sys/dev/fdc/fdc_isa.c 1.3 +5 -12 src/sys/dev/fdc/fdc_pccard.c 1.2 +10 -0 src/sys/dev/fdc/fdcvar.h