Deleted Added
full compact
fdc.c (103384) 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/pc98/cbus/fdc.c 103384 2002-09-16 07:39:47Z nyan $
53 * $FreeBSD: head/sys/pc98/cbus/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>

--- 2987 unchanged lines hidden (view full) ---

3049 case 6:
3050 fdc->state = RESETCTLR;
3051 break;
3052 case 7:
3053 break;
3054 default:
3055 fail:
3056 if ((fd->options & FDOPT_NOERRLOG) == 0) {
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>

--- 2987 unchanged lines hidden (view full) ---

3049 case 6:
3050 fdc->state = RESETCTLR;
3051 break;
3052 case 7:
3053 break;
3054 default:
3055 fail:
3056 if ((fd->options & FDOPT_NOERRLOG) == 0) {
3057 diskerr(bp, "hard error", fdc->fd->skip / DEV_BSIZE,
3058 (struct disklabel *)NULL);
3057 disk_err(bp, "hard error",
3058 fdc->fd->skip / DEV_BSIZE, 0);
3059 if (fdc->flags & FDC_STAT_VALID) {
3060 printf(
3061 " (ST0 %b ST1 %b ST2 %b cyl %u hd %u sec %u)\n",
3062 fdc->status[0], NE7_ST0BITS,
3063 fdc->status[1], NE7_ST1BITS,
3064 fdc->status[2], NE7_ST2BITS,
3065 fdc->status[3], fdc->status[4],
3066 fdc->status[5]);

--- 308 unchanged lines hidden ---
3059 if (fdc->flags & FDC_STAT_VALID) {
3060 printf(
3061 " (ST0 %b ST1 %b ST2 %b cyl %u hd %u sec %u)\n",
3062 fdc->status[0], NE7_ST0BITS,
3063 fdc->status[1], NE7_ST1BITS,
3064 fdc->status[2], NE7_ST2BITS,
3065 fdc->status[3], fdc->status[4],
3066 fdc->status[5]);

--- 308 unchanged lines hidden ---