| fdc.c (46965) | fdc.c (47618) |
|---|---|
| 1/* 2 * Copyright (c) 1990 The Regents of the University of California. 3 * All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Don Ahn. 7 * 8 * Libretto PCMCIA floppy support by David Horwitt (dhorwitt@ucsd.edu) --- 33 unchanged lines hidden (view full) --- 42 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 43 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 44 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 45 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 46 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 47 * SUCH DAMAGE. 48 * 49 * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 | 1/* 2 * Copyright (c) 1990 The Regents of the University of California. 3 * All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Don Ahn. 7 * 8 * Libretto PCMCIA floppy support by David Horwitt (dhorwitt@ucsd.edu) --- 33 unchanged lines hidden (view full) --- 42 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 43 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 44 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 45 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 46 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 47 * SUCH DAMAGE. 48 * 49 * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 |
| 50 * $Id: fd.c,v 1.142 1999/05/08 21:59:24 dfr Exp $ | 50 * $Id: fd.c,v 1.143 1999/05/11 04:58:30 bde Exp $ |
| 51 * 52 */ 53 54#include "fd.h" 55#include "opt_devfs.h" 56#include "opt_fdc.h" 57 58#if NFDC > 0 --- 22 unchanged lines hidden (view full) --- 81#include <machine/stdarg.h> 82 83#ifdef DEVFS 84#include <sys/devfsext.h> 85#endif /* DEVFS */ 86 87#include <isa/isavar.h> 88#include <i386/isa/isa.h> | 51 * 52 */ 53 54#include "fd.h" 55#include "opt_devfs.h" 56#include "opt_fdc.h" 57 58#if NFDC > 0 --- 22 unchanged lines hidden (view full) --- 81#include <machine/stdarg.h> 82 83#ifdef DEVFS 84#include <sys/devfsext.h> 85#endif /* DEVFS */ 86 87#include <isa/isavar.h> 88#include <i386/isa/isa.h> |
| 89#include <i386/isa/isa_dma.h> | |
| 90#include <i386/isa/fdreg.h> 91#include <i386/isa/fdc.h> 92#include <i386/isa/rtc.h> 93 94#ifdef FDC_YE 95#undef FDC_YE 96#warning "fix FDC_YE! - newbus casualty" 97#endif --- 654 unchanged lines hidden (view full) --- 752 u_int fdt, st0, st3; 753 struct fd_data *fd; 754 struct fdc_data *fdc; 755 fdsu_t fdsu; 756#ifndef FIFO_BEFORE_MOTORON 757 static int fd_fifo = 0; 758#endif 759 | 89#include <i386/isa/fdreg.h> 90#include <i386/isa/fdc.h> 91#include <i386/isa/rtc.h> 92 93#ifdef FDC_YE 94#undef FDC_YE 95#warning "fix FDC_YE! - newbus casualty" 96#endif --- 654 unchanged lines hidden (view full) --- 751 u_int fdt, st0, st3; 752 struct fd_data *fd; 753 struct fdc_data *fdc; 754 fdsu_t fdsu; 755#ifndef FIFO_BEFORE_MOTORON 756 static int fd_fifo = 0; 757#endif 758 |
| 759 /* No pnp support */ 760 if (isa_get_vendorid(dev)) 761 return (ENXIO); 762 |
|
| 760 fdsu = *(int *)device_get_ivars(dev); /* xxx cheat a bit... */ 761 fd = device_get_softc(dev); 762 fdc = device_get_softc(device_get_parent(dev)); 763 764 bzero(fd, sizeof *fd); 765 fd->dev = dev; 766 fd->fdc = fdc; 767 fd->fdsu = fdsu; --- 1613 unchanged lines hidden --- | 763 fdsu = *(int *)device_get_ivars(dev); /* xxx cheat a bit... */ 764 fd = device_get_softc(dev); 765 fdc = device_get_softc(device_get_parent(dev)); 766 767 bzero(fd, sizeof *fd); 768 fd->dev = dev; 769 fd->fdc = fdc; 770 fd->fdsu = fdsu; --- 1613 unchanged lines hidden --- |