diff options
Diffstat (limited to 'sys/dev/ppbus/ppbconf.h')
| -rw-r--r-- | sys/dev/ppbus/ppbconf.h | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h index c47e4ab7d04dd..80efe282a62b3 100644 --- a/sys/dev/ppbus/ppbconf.h +++ b/sys/dev/ppbus/ppbconf.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ppbconf.h,v 1.10 1999/01/10 12:04:55 nsouch Exp $ + * $Id: ppbconf.h,v 1.8 1998/09/13 18:26:26 nsouch Exp $ * */ #ifndef __PPBCONF_H @@ -47,12 +47,7 @@ #define PPB_EPP 0x4 /* EPP mode, 32 bit */ #define PPB_ECP 0x8 /* ECP mode */ -/* mode aliases */ -#define PPB_SPP PPB_NIBBLE|PPB_PS2 -#define PPB_BYTE PPB_PS2 - -#define PPB_MASK 0x0f -#define PPB_OPTIONS_MASK 0xf0 +#define PPB_SPP PPB_NIBBLE|PPB_PS2 #define PPB_IS_EPP(mode) (mode & PPB_EPP) #define PPB_IN_EPP_MODE(dev) (PPB_IS_EPP (ppb_get_mode (dev))) @@ -108,8 +103,6 @@ struct ppb_status { #define PPB_NOINTR 0 #define PPB_WAIT 0x1 #define PPB_INTR 0x2 -#define PPB_POLL 0x4 -#define PPB_FOREVER -1 /* * Microsequence stuff. @@ -151,14 +144,14 @@ struct ppb_context { struct microseq *curmsq; /* currently executed microseqence */ }; + struct ppb_device { int id_unit; /* unit of the device */ char *name; /* name of the device */ ushort mode; /* current mode of the device */ - ushort avm; /* available IEEE1284 modes of - * the device */ + ushort avm; /* available modes of the device */ struct ppb_context ctx; /* context of the device */ @@ -191,8 +184,6 @@ struct ppb_adapter { int (*exec_microseq)(int, struct ppb_microseq **); int (*setmode)(int, int); - int (*read)(int, char *, int, int); - int (*write)(int, char *, int, int); void (*outsb_epp)(int, char *, int); void (*outsw_epp)(int, char *, int); @@ -201,12 +192,12 @@ struct ppb_adapter { void (*insw_epp)(int, char *, int); void (*insl_epp)(int, char *, int); - u_char (*r_dtr)(int); - u_char (*r_str)(int); - u_char (*r_ctr)(int); - u_char (*r_epp)(int); - u_char (*r_ecr)(int); - u_char (*r_fifo)(int); + char (*r_dtr)(int); + char (*r_str)(int); + char (*r_ctr)(int); + char (*r_epp)(int); + char (*r_ecr)(int); + char (*r_fifo)(int); void (*w_dtr)(int, char); void (*w_str)(int, char); @@ -239,7 +230,7 @@ struct ppb_link { /* * Maximum size of the PnP info string */ -#define PPB_PnP_STRING_SIZE 256 /* XXX */ +#define PPB_PnP_STRING_SIZE 128 /* XXX */ /* * Parallel Port Bus structure. @@ -259,11 +250,10 @@ struct ppb_data { #define PPB_PnP_UNKNOWN 10 int class_id; /* not a PnP device if class_id < 0 */ - int state; /* current IEEE1284 state */ - int error; /* last IEEE1284 error */ - ushort mode; /* IEEE 1284-1994 mode * NIBBLE, PS2, EPP or ECP */ + ushort avm; /* IEEE 1284-1994 available + * modes */ struct ppb_link *ppb_link; /* link to the adapter */ struct ppb_device *ppb_owner; /* device which owns the bus */ @@ -304,7 +294,6 @@ extern int ppb_ecp_sync(struct ppb_device *); extern int ppb_get_status(struct ppb_device *, struct ppb_status *); extern int ppb_set_mode(struct ppb_device *, int); -extern int ppb_write(struct ppb_device *, char *, int, int); /* * These are defined as macros for speedup. |