From owner-svn-src-all@FreeBSD.ORG Tue Feb 3 19:49:22 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 611DA106566B; Tue, 3 Feb 2009 19:49:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 34F098FC18; Tue, 3 Feb 2009 19:49:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n13JnMKn040062; Tue, 3 Feb 2009 19:49:22 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n13JnMM4040061; Tue, 3 Feb 2009 19:49:22 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200902031949.n13JnMM4040061@svn.freebsd.org> From: John Baldwin Date: Tue, 3 Feb 2009 19:49:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188093 - head/sys/dev/ppbus X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2009 19:49:22 -0000 Author: jhb Date: Tue Feb 3 19:49:21 2009 New Revision: 188093 URL: http://svn.freebsd.org/changeset/base/188093 Log: Trim what we expose to userland in to just the constants used for the ppi(4) ioctls for bits in the control and status registers. Reviewed by: db Modified: head/sys/dev/ppbus/ppbconf.h Modified: head/sys/dev/ppbus/ppbconf.h ============================================================================== --- head/sys/dev/ppbus/ppbconf.h Tue Feb 3 19:47:31 2009 (r188092) +++ head/sys/dev/ppbus/ppbconf.h Tue Feb 3 19:49:21 2009 (r188093) @@ -29,6 +29,35 @@ #ifndef __PPBCONF_H #define __PPBCONF_H +#define n(flags) (~(flags) & (flags)) + +/* + * Parallel Port Chipset control bits. + */ +#define STROBE 0x01 +#define AUTOFEED 0x02 +#define nINIT 0x04 +#define SELECTIN 0x08 +#define IRQENABLE 0x10 +#define PCD 0x20 + +#define nSTROBE n(STROBE) +#define nAUTOFEED n(AUTOFEED) +#define INIT n(nINIT) +#define nSELECTIN n(SELECTIN) +#define nPCD n(PCD) + +/* + * Parallel Port Chipset status bits. + */ +#define TIMEOUT 0x01 +#define nFAULT 0x08 +#define SELECT 0x10 +#define PERROR 0x20 +#define nACK 0x40 +#define nBUSY 0x80 + +#ifdef _KERNEL #include /* @@ -59,34 +88,6 @@ #define PPB_IN_NIBBLE_MODE(bus) (ppb_get_mode (bus) & PPB_NIBBLE) #define PPB_IN_PS2_MODE(bus) (ppb_get_mode (bus) & PPB_PS2) -#define n(flags) (~(flags) & (flags)) - -/* - * Parallel Port Chipset control bits. - */ -#define STROBE 0x01 -#define AUTOFEED 0x02 -#define nINIT 0x04 -#define SELECTIN 0x08 -#define IRQENABLE 0x10 -#define PCD 0x20 - -#define nSTROBE n(STROBE) -#define nAUTOFEED n(AUTOFEED) -#define INIT n(nINIT) -#define nSELECTIN n(SELECTIN) -#define nPCD n(PCD) - -/* - * Parallel Port Chipset status bits. - */ -#define TIMEOUT 0x01 -#define nFAULT 0x08 -#define SELECT 0x10 -#define PERROR 0x20 -#define nACK 0x40 -#define nBUSY 0x80 - /* * Structure to store status information. */ @@ -251,7 +252,6 @@ struct callout; typedef int (*ppc_intr_handler)(void *); -#ifdef _KERNEL extern int ppb_attach_device(device_t); extern int ppb_request_bus(device_t, device_t, int); extern int ppb_release_bus(device_t, device_t);