| fdc.c (103359) | fdc.c (103675) |
|---|---|
| 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) --- 36 unchanged lines hidden (view full) --- 45 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 46 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 47 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 48 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 49 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 50 * SUCH DAMAGE. 51 * 52 * 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) --- 36 unchanged lines hidden (view full) --- 45 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 46 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 47 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 48 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 49 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 50 * SUCH DAMAGE. 51 * 52 * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 |
| 53 * $FreeBSD: head/sys/dev/fdc/fdc.c 103359 2002-09-15 21:25:55Z phk $ | 53 * $FreeBSD: head/sys/dev/fdc/fdc.c 103675 2002-09-20 12:52:03Z phk $ |
| 54 */ 55 56#include "opt_fdc.h" 57#include "card.h" 58 59#include <sys/param.h> 60#include <sys/systm.h> 61#include <sys/bio.h> 62#include <sys/bus.h> 63#include <sys/conf.h> 64#include <sys/devicestat.h> | 54 */ 55 56#include "opt_fdc.h" 57#include "card.h" 58 59#include <sys/param.h> 60#include <sys/systm.h> 61#include <sys/bio.h> 62#include <sys/bus.h> 63#include <sys/conf.h> 64#include <sys/devicestat.h> |
| 65#include <sys/disk.h> |
|
| 65#include <sys/disklabel.h> 66#include <sys/fcntl.h> 67#include <sys/fdcio.h> 68#include <sys/filio.h> 69#include <sys/kernel.h> 70#include <sys/lock.h> 71#include <sys/malloc.h> 72#include <sys/module.h> --- 2434 unchanged lines hidden (view full) --- 2507 case 6: 2508 fdc->state = RESETCTLR; 2509 break; 2510 case 7: 2511 break; 2512 default: 2513 fail: 2514 if ((fd->options & FDOPT_NOERRLOG) == 0) { | 66#include <sys/disklabel.h> 67#include <sys/fcntl.h> 68#include <sys/fdcio.h> 69#include <sys/filio.h> 70#include <sys/kernel.h> 71#include <sys/lock.h> 72#include <sys/malloc.h> 73#include <sys/module.h> --- 2434 unchanged lines hidden (view full) --- 2508 case 6: 2509 fdc->state = RESETCTLR; 2510 break; 2511 case 7: 2512 break; 2513 default: 2514 fail: 2515 if ((fd->options & FDOPT_NOERRLOG) == 0) { |
| 2515 diskerr(bp, "hard error", fdc->fd->skip / DEV_BSIZE, 2516 (struct disklabel *)NULL); | 2516 disk_err(bp, "hard error", 2517 fdc->fd->skip / DEV_BSIZE, 0); |
| 2517 if (fdc->flags & FDC_STAT_VALID) { 2518 printf( 2519 " (ST0 %b ST1 %b ST2 %b cyl %u hd %u sec %u)\n", 2520 fdc->status[0], NE7_ST0BITS, 2521 fdc->status[1], NE7_ST1BITS, 2522 fdc->status[2], NE7_ST2BITS, 2523 fdc->status[3], fdc->status[4], 2524 fdc->status[5]); --- 304 unchanged lines hidden --- | 2518 if (fdc->flags & FDC_STAT_VALID) { 2519 printf( 2520 " (ST0 %b ST1 %b ST2 %b cyl %u hd %u sec %u)\n", 2521 fdc->status[0], NE7_ST0BITS, 2522 fdc->status[1], NE7_ST1BITS, 2523 fdc->status[2], NE7_ST2BITS, 2524 fdc->status[3], fdc->status[4], 2525 fdc->status[5]); --- 304 unchanged lines hidden --- |