Synchronise with recent changes to the ISA wd driver.
Remove the remaining ISA dependencies, busify and support 32 bit PIO.
This commit is contained in:
mark
parent
d8bc5f0aa6
commit
e9b9aedd51
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,82 +0,0 @@
|
|||
/* $NetBSD: wdcvar.h,v 1.2 1997/10/14 19:13:58 mark Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to Berkeley by
|
||||
* William Jolitz.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the University of
|
||||
* California, Berkeley and its contributors.
|
||||
* 4. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)wdreg.h 7.1 (Berkeley) 5/9/91
|
||||
*/
|
||||
|
||||
/*
|
||||
* softc structure for the wdc device
|
||||
*/
|
||||
|
||||
struct wdc_softc {
|
||||
struct device sc_dev; /* device node */
|
||||
void *sc_ih; /* interrupt pointer */
|
||||
|
||||
bus_space_tag_t sc_iot; /* Bus space tag */
|
||||
bus_space_handle_t sc_ioh; /* handle for drive registers */
|
||||
bus_space_handle_t sc_auxioh; /* handle for aux register */
|
||||
bus_space_handle_t sc_dataioh; /* handle for 16 bit data */
|
||||
bus_space_handle_t sc_data32ioh;/* handle for 32 bit data */
|
||||
|
||||
void (*sc_inten)(struct wdc_softc *, int);
|
||||
|
||||
int sc_drq; /* DMA channel */
|
||||
|
||||
TAILQ_HEAD(drivehead, wd_softc) sc_drives;
|
||||
int sc_flags;
|
||||
#define WDCF_ACTIVE 0x01 /* controller is active */
|
||||
#define WDCF_SINGLE 0x02 /* sector at a time mode */
|
||||
#define WDCF_ERROR 0x04 /* processing a disk error */
|
||||
#define WDCF_WANTED 0x08 /* XXX locking for wd_get_parms() */
|
||||
#define WDCF_QUIET 0x10 /* Be quiet about errors */
|
||||
#define WDCF_32BIT 0x20 /* Use 32bit xfers */
|
||||
#define WDCF_NORESET 0x10000 /* Don't reset bus */
|
||||
int sc_errors; /* errors during current transfer */
|
||||
u_char sc_status; /* copy of status register */
|
||||
u_char sc_error; /* copy of error register */
|
||||
};
|
||||
|
||||
int wdcprobe_internal __P((bus_space_tag_t iot, bus_space_handle_t ioh,
|
||||
bus_space_handle_t aux_ioh, bus_space_handle_t data_ioh,
|
||||
bus_space_handle_t data32_ioh, char *name));
|
||||
void wdcattach_internal __P((struct wdc_softc *wdc, bus_space_tag_t iot, bus_space_handle_t ioh,
|
||||
bus_space_handle_t aux_ioh, bus_space_handle_t data_ioh,
|
||||
bus_space_handle_t data32_ioh, int drq));
|
||||
|
||||
int wdcintr __P((void *));
|
||||
|
||||
/* End of wdcvar.h */
|
||||
|
|
@ -0,0 +1,174 @@
|
|||
/* $NetBSD: wdlink.h,v 1.1 1997/10/17 06:41:42 mark Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
|
||||
*
|
||||
* DMA and multi-sector PIO handling are derived from code contributed by
|
||||
* Onno van der Linden.
|
||||
*
|
||||
* Atapi support added by Manuel Bouyer.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by Charles M. Hannum.
|
||||
* 4. The name of the author may not be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* from: wdlink.h,v 1.3 1997/09/03 07:57:53 bouyer Exp
|
||||
*/
|
||||
|
||||
|
||||
#undef WDDEBUG
|
||||
/* #undef DIAGNOSTIC */
|
||||
|
||||
struct wdc_softc {
|
||||
struct device sc_dev;
|
||||
void *sc_ih;
|
||||
struct wd_link *d_link[2];
|
||||
struct scsipi_link *ab_link;
|
||||
|
||||
bus_space_tag_t sc_iot; /* Bus space tag */
|
||||
bus_space_handle_t sc_ioh; /* handle for drive registers */
|
||||
bus_space_handle_t sc_auxioh; /* handle for aux register */
|
||||
bus_space_handle_t sc_dataioh; /* handle for 16 bit data */
|
||||
bus_space_handle_t sc_data32ioh;/* handle for 32 bit data */
|
||||
|
||||
void (*sc_inten)(struct wdc_softc *, int);
|
||||
|
||||
int sc_drq; /* DMA channel */
|
||||
|
||||
TAILQ_HEAD(xferhead, wdc_xfer) sc_xfer;
|
||||
int sc_flags;
|
||||
#define WDCF_ACTIVE 0x01 /* controller is active */
|
||||
#define WDCF_SINGLE 0x02 /* sector at a time mode */
|
||||
#define WDCF_ERROR 0x04 /* processing a disk error */
|
||||
#define WDCF_WANTED 0x08 /* XXX locking for wd_get_parms() */
|
||||
#define WDCF_IRQ_WAIT 0x10 /* controller is waiting for irq */
|
||||
#define WDCF_ONESLAVE 0x20 /* ctrl. has one ATAPI slave attached */
|
||||
#define WDCF_QUIET 0x40 /* Be quiet about errors */
|
||||
#define WDCF_32BIT 0x80 /* Use 32bit xfers */
|
||||
#define WDCF_NORESET 0x10000 /* Don't reset bus */
|
||||
|
||||
int sc_errors; /* errors during current transfer */
|
||||
u_char sc_status; /* copy of status register */
|
||||
u_char sc_error; /* copy of error register */
|
||||
u_char sc_drives_mask; /* bitmask for drives present/absent */
|
||||
};
|
||||
|
||||
int wdcprobe_internal __P((bus_space_tag_t iot, bus_space_handle_t ioh,
|
||||
bus_space_handle_t aux_ioh, bus_space_handle_t data_ioh,
|
||||
bus_space_handle_t data32_ioh, char *name));
|
||||
void wdcattach_internal __P((struct wdc_softc *wdc, bus_space_tag_t iot,
|
||||
bus_space_handle_t ioh, bus_space_handle_t aux_ioh,
|
||||
bus_space_handle_t data_ioh, bus_space_handle_t data32_ioh, int drq));
|
||||
|
||||
struct wd_link {
|
||||
u_int8_t type;
|
||||
#define ATA 0
|
||||
#define ATAPI 1
|
||||
u_int8_t channel;
|
||||
u_int8_t drive;
|
||||
caddr_t wdc_softc;
|
||||
caddr_t wd_softc;
|
||||
struct wdparams sc_params;
|
||||
|
||||
/* Long-term state: */
|
||||
u_int8_t openings;
|
||||
int sc_state; /* control state */
|
||||
#define RECAL 0 /* recalibrate */
|
||||
#define RECAL_WAIT 1 /* done recalibrating */
|
||||
#define GEOMETRY 2 /* upload geometry */
|
||||
#define GEOMETRY_WAIT 3 /* done uploading geometry */
|
||||
#define MULTIMODE 4 /* set multiple mode */
|
||||
#define MULTIMODE_WAIT 5 /* done setting multiple mode */
|
||||
#define READY 6 /* done with open */
|
||||
int sc_mode; /* transfer mode */
|
||||
#define WDM_PIOSINGLE 0 /* single-sector PIO */
|
||||
#define WDM_PIOMULTI 1 /* multi-sector PIO */
|
||||
#define WDM_DMA 2 /* DMA */
|
||||
int sc_multiple; /* multiple for WDM_PIOMULTI */
|
||||
int sc_flags; /* drive characteistics found */
|
||||
#define WDF_LOCKED 0x01
|
||||
#define WDF_WANTED 0x02
|
||||
#define WDF_WLABEL 0x04 /* label is writable */
|
||||
#define WDF_LABELLING 0x08 /* writing label */
|
||||
|
||||
/*
|
||||
* XXX Nothing resets this yet, but disk change sensing will when ATAPI is
|
||||
* implemented.
|
||||
*/
|
||||
#define WDF_LOADED 0x10 /* parameters loaded */
|
||||
#define WDF_32BIT 0x20 /* can do 32-bit transfer */
|
||||
#define WDF_WAIT 0x40 /* waiting for resourses */
|
||||
|
||||
daddr_t sc_badsect[127]; /* 126 plus trailing -1 marker */
|
||||
struct disklabel *sc_lp; /* label info for this disk */
|
||||
};
|
||||
|
||||
struct wdc_xfer {
|
||||
struct wd_link *d_link; /* drive/bus structure info */
|
||||
volatile long c_flags; /* handle: scsi flags (0x0000ffff)
|
||||
b_read/b_write (0x00f00000)
|
||||
controllers flags (0x000f0000) */
|
||||
#define C_INUSE 0x010000
|
||||
#define C_ATAPI 0x020000
|
||||
#define C_ERROR 0x040000
|
||||
#define C_NEEDDONE 0x080000
|
||||
|
||||
/* Information about the current transfer */
|
||||
struct buf *c_bp;
|
||||
void *atapi_cmd;
|
||||
void *databuf;
|
||||
daddr_t c_blkno; /* starting block number */
|
||||
int c_bcount; /* byte count left */
|
||||
int c_skip; /* bytes already transferred */
|
||||
int c_nblks; /* number of blocks currently transferring */
|
||||
int c_nbytes; /* number of bytes currently transferring */
|
||||
u_long c_p_offset; /* offset of the partition */
|
||||
TAILQ_ENTRY(wdc_xfer) c_xferchain;
|
||||
LIST_ENTRY(wdc_xfer) free_list;
|
||||
};
|
||||
|
||||
void wdc_exec_xfer __P((struct wdc_softc *, struct wd_link *,
|
||||
struct wdc_xfer *));
|
||||
struct wdc_xfer *wdc_get_xfer __P((int));
|
||||
int wdc_get_parms __P((struct wdc_softc *, struct wd_link *));
|
||||
void wdstart __P((void*));
|
||||
void wderror __P((struct wd_link* , struct buf *, char *));
|
||||
void wddone __P((struct wd_link*, struct buf*));
|
||||
int wdccommand __P((struct wdc_softc *, struct wd_link *, int, int,
|
||||
int, int, int, int));
|
||||
int wdccommandshort __P((struct wdc_softc *, int, int));
|
||||
int wdcwait __P((struct wdc_softc *, int));
|
||||
|
||||
int wdcintr __P((void *));
|
||||
|
||||
/*
|
||||
* ST506 spec says that if READY or SEEKCMPLT go off, then the read or write
|
||||
* command is aborted.
|
||||
*/
|
||||
#define wait_for_drq(d) wdcwait(d, WDCS_DRDY | WDCS_DSC | WDCS_DRQ)
|
||||
#define wait_for_unbusy(d) wdcwait(d, 0)
|
||||
#define wait_for_ready(d) wdcwait(d, WDCS_DRDY | WDCS_DSC)
|
||||
#define atapi_ready(d) wdcwait(d, WDCS_DRQ)
|
||||
|
||||
#define IDE_NOSLEEP 0x01
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: wdreg.h,v 1.2 1997/02/04 02:04:55 mark Exp $ */
|
||||
/* $NetBSD: wdreg.h,v 1.3 1997/10/17 06:41:45 mark Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)wdreg.h 7.1 (Berkeley) 5/9/91
|
||||
* from: wdreg.h,v 1.13 1995/03/29 21:56:46 briggs Exp
|
||||
* from: wdreg.h,v 1.14 1997/08/27 11:25:18 bouyer Exp
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -47,6 +47,7 @@
|
|||
#define wd_precomp 0x001 /* write precompensation (W) */
|
||||
#define wd_features 0x001 /* features (W) */
|
||||
#define wd_seccnt 0x002 /* sector count (R/W) */
|
||||
#define wd_ireason 0x002 /* interrupt reason (R/W) (for atapi) */
|
||||
#define wd_sector 0x003 /* first sector number (R/W) */
|
||||
#define wd_cyl_lo 0x004 /* cylinder address, low byte (R/W) */
|
||||
#define wd_cyl_hi 0x005 /* cylinder address, high byte (R/W) */
|
||||
|
|
@ -54,13 +55,13 @@
|
|||
#define wd_command 0x007 /* command register (W) */
|
||||
#define wd_status 0x007 /* immediate status (R) */
|
||||
|
||||
#define WD_ALTSTATUS 0x206 /* base offset for alt status */
|
||||
#define wd_altsts 0x000 /* alternate fixed disk status (via 1015) (R) */
|
||||
#define wd_ctlr 0x000 /* fixed disk controller control (via 1015) (W) */
|
||||
#define wd_altsts 0x206 /* alternate fixed disk status (via 1015) (R) */
|
||||
#define WD_ALTSTATUS wd_altsts
|
||||
#define wd_ctlr 0x206 /* fixed disk controller control (via 1015) (W) */
|
||||
#define WDCTL_4BIT 0x08 /* use four head bits (wd1003) */
|
||||
#define WDCTL_RST 0x04 /* reset the controller */
|
||||
#define WDCTL_IDS 0x02 /* disable controller interrupts */
|
||||
#define wd_digin 0x001 /* disk controller input (via 1015) (R) */
|
||||
#define wd_digin 0x207 /* disk controller input (via 1015) (R) */
|
||||
|
||||
/*
|
||||
* Status bits.
|
||||
|
|
@ -120,6 +121,29 @@
|
|||
#define WDSD_CHS 0x00 /* cylinder/head/sector addressing */
|
||||
#define WDSD_LBA 0x40 /* logical block addressing */
|
||||
|
||||
/* Commands for ATAPI devices */
|
||||
#define ATAPI_CHECK_POWER_MODE 0xe5
|
||||
#define ATAPI_EXEC_DRIVE_DIAGS 0x90
|
||||
#define ATAPI_IDLE_IMMEDIATE 0xe1
|
||||
#define ATAPI_NOP 0x00
|
||||
#define ATAPI_PACKET_COMMAND 0xa0
|
||||
#define ATAPI_IDENTIFY_DEVICE 0xa1
|
||||
#define ATAPI_SOFT_RESET 0x08
|
||||
#define ATAPI_SET_FEATURES 0xef
|
||||
#define ATAPI_SLEEP 0xe6
|
||||
#define ATAPI_STANDBY_IMMEDIATE 0xe0
|
||||
|
||||
/* ireason */
|
||||
#define WDCI_CMD 0x01 /* command(1) or data(0) */
|
||||
#define WDCI_IN 0x02 /* transfer to(1) or from(0) the host */
|
||||
#define WDCI_RELEASE 0x04 /* bus released until completion */
|
||||
|
||||
#define PHASE_CMDOUT (WDCS_DRQ | WDCI_CMD)
|
||||
#define PHASE_DATAIN (WDCS_DRQ | WDCI_IN)
|
||||
#define PHASE_DATAOUT WDCS_DRQ
|
||||
#define PHASE_COMPLETED (WDCI_IN | WDCI_CMD)
|
||||
#define PHASE_ABORTED 0
|
||||
|
||||
|
||||
#ifdef _KERNEL
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in New Issue