TAB/space cleanup.
This commit is contained in:
parent
ef022d1b15
commit
59dafa2c6b
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: arcbios.h,v 1.4 2001/06/13 15:08:05 soda Exp $ */
|
||||
/* $NetBSD: arcbios.h,v 1.5 2003/01/19 10:06:12 tsutsui Exp $ */
|
||||
/* $OpenBSD: arcbios.h,v 1.1 1998/01/29 15:06:22 pefo Exp $ */
|
||||
|
||||
/*-
|
||||
|
@ -330,7 +330,7 @@ typedef struct arc_calls
|
|||
#define ARC_PARAM_BLK_MAGIC 0x53435241
|
||||
#define ARC_PARAM_BLK_MAGIC_BUG 0x41524353 /* This is wrong... but req */
|
||||
|
||||
typedef struct arc_param_blk
|
||||
typedef struct arc_param_blk
|
||||
{
|
||||
u_int32_t magic; /* Magic Number */
|
||||
u_int32_t length; /* Length of parameter block */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: bus_dma.c,v 1.12 2002/06/02 14:44:42 drochner Exp $ */
|
||||
/* $NetBSD: bus_dma.c,v 1.13 2003/01/19 10:06:12 tsutsui Exp $ */
|
||||
/* NetBSD: bus_dma.c,v 1.20 2000/01/10 03:24:36 simonb Exp */
|
||||
|
||||
/*-
|
||||
|
@ -522,7 +522,7 @@ _bus_dmamap_sync(t, map, offset, len, ops)
|
|||
minlen = len < map->dm_segs[i].ds_len - offset ?
|
||||
len : map->dm_segs[i].ds_len - offset;
|
||||
|
||||
addr = map->dm_segs[i]._ds_vaddr;
|
||||
addr = map->dm_segs[i]._ds_vaddr;
|
||||
|
||||
#ifdef BUS_DMA_DEBUG
|
||||
printf("bus_dmamap_sync: flushing segment %d "
|
||||
|
@ -594,12 +594,12 @@ _bus_dmamem_alloc(t, size, alignment, boundary, segs, nsegs, rsegs, flags)
|
|||
int
|
||||
_bus_dmamem_alloc_range(t, size, alignment, boundary, segs, nsegs, rsegs,
|
||||
flags, low, high)
|
||||
bus_dma_tag_t t;
|
||||
bus_dma_tag_t t;
|
||||
bus_size_t size, alignment, boundary;
|
||||
bus_dma_segment_t *segs;
|
||||
int nsegs;
|
||||
int *rsegs;
|
||||
int flags;
|
||||
int flags;
|
||||
paddr_t low;
|
||||
paddr_t high;
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: bus_space_sparse.c,v 1.6 2001/09/10 21:19:31 chris Exp $ */
|
||||
/* $NetBSD: bus_space_sparse.c,v 1.7 2003/01/19 10:06:12 tsutsui Exp $ */
|
||||
/* NetBSD: bus_machdep.c,v 1.1 2000/01/26 18:48:00 drochner Exp */
|
||||
|
||||
/*-
|
||||
|
@ -118,7 +118,7 @@ arc_sparse_bus_space_compose_handle(bst, addr, size, flags, bshp)
|
|||
paddr_t start = bst->bs_pbase + mips_trunc_page(offset);
|
||||
paddr_t end = bst->bs_pbase + mips_round_page(offset + size);
|
||||
|
||||
if (end <= MIPS_KSEG1_START - MIPS_KSEG0_START) {
|
||||
if (end <= MIPS_KSEG1_START - MIPS_KSEG0_START) {
|
||||
/* mappable on KSEG0 or KSEG1 */
|
||||
*bshp = (cacheable ?
|
||||
MIPS_PHYS_TO_KSEG0(start) :
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: c_isa.c,v 1.2 2002/12/04 07:43:55 imp Exp $ */
|
||||
/* $NetBSD: c_isa.c,v 1.3 2003/01/19 10:06:12 tsutsui Exp $ */
|
||||
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
|
||||
|
||||
/*-
|
||||
|
@ -152,7 +152,7 @@ isabr_dti_intr_status()
|
|||
if (vector < 0) /* XXX: OpenBSD source had a bug, re-look this */
|
||||
return (-1);
|
||||
isa_vector = vector & 7;
|
||||
if (isa_vector == 2) {
|
||||
if (isa_vector == 2) {
|
||||
isa_outb(IO_ICU2, 0x0f);
|
||||
vector = isa_inb(IO_ICU2);
|
||||
if (vector > 0) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: c_nec_pci.c,v 1.3 2002/12/28 16:52:02 tsutsui Exp $ */
|
||||
/* $NetBSD: c_nec_pci.c,v 1.4 2003/01/19 10:06:12 tsutsui Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (C) 2000 Shuichiro URATA. All rights reserved.
|
||||
|
@ -86,18 +86,18 @@ char *c_nec_pci_mainbusdevs[] = {
|
|||
NULL,
|
||||
};
|
||||
|
||||
/*
|
||||
/*
|
||||
* chipset-dependent mcclock routines.
|
||||
*/
|
||||
|
||||
u_int mc_nec_pci_read __P((struct mcclock_softc *, u_int));
|
||||
void mc_nec_pci_write __P((struct mcclock_softc *, u_int, u_int));
|
||||
|
||||
|
||||
struct mcclock_jazzio_config mcclock_nec_pci_conf = {
|
||||
0x80004000, 2,
|
||||
{ mc_nec_pci_read, mc_nec_pci_write }
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
u_int
|
||||
mc_nec_pci_read(sc, reg)
|
||||
struct mcclock_softc *sc;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: disksubr.c,v 1.12 2002/02/19 17:09:42 wiz Exp $ */
|
||||
/* $NetBSD: disksubr.c,v 1.13 2003/01/19 10:06:12 tsutsui Exp $ */
|
||||
/* $OpenBSD: disksubr.c,v 1.14 1997/05/08 00:14:29 deraadt Exp $ */
|
||||
/* NetBSD: disksubr.c,v 1.40 1999/05/06 15:45:51 christos Exp */
|
||||
|
||||
|
@ -57,7 +57,7 @@ static struct mbr_partition *
|
|||
mbr_findslice __P((struct mbr_partition* dp, struct buf *bp));
|
||||
|
||||
|
||||
/*
|
||||
/*
|
||||
* Scan MBR for NetBSD partittion.
|
||||
*
|
||||
* OpenBSD source suggests MBR_MAGIC does not always exist, so,
|
||||
|
@ -239,7 +239,7 @@ readdisklabel(dev, strat, lp, osdep)
|
|||
/* update disklabel with details */
|
||||
lp->d_partitions[2].p_size =
|
||||
dp->mbrp_size;
|
||||
lp->d_partitions[2].p_offset =
|
||||
lp->d_partitions[2].p_offset =
|
||||
dp->mbrp_start;
|
||||
|
||||
if (dp->mbrp_typ == MBR_PTYPE_OPENBSD) {
|
||||
|
@ -472,7 +472,7 @@ nombrpart:
|
|||
/* disklabel in appropriate location? */
|
||||
if (lp->d_partitions[2].p_offset != 0
|
||||
&& lp->d_partitions[2].p_offset != dospartoff) {
|
||||
error = EXDEV;
|
||||
error = EXDEV;
|
||||
goto done;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.73 2003/01/17 22:19:05 thorpej Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.74 2003/01/19 10:06:12 tsutsui Exp $ */
|
||||
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
|
||||
|
||||
/*
|
||||
|
@ -222,7 +222,7 @@ mach_init(argc, argv, envv)
|
|||
|
||||
/* Initialize the CPU type */
|
||||
ident_platform();
|
||||
if (platform == NULL) {
|
||||
if (platform == NULL) {
|
||||
/* This is probably the best we can do... */
|
||||
printf("kernel not configured for this system:\n");
|
||||
printf("ID [%s] Vendor [%8.8s] Product [%02x",
|
||||
|
@ -299,7 +299,7 @@ mach_init(argc, argv, envv)
|
|||
* Set the VM page size.
|
||||
*/
|
||||
uvm_setpagesize();
|
||||
|
||||
|
||||
/* make sure that we don't call BIOS console from now on */
|
||||
cn_tab = NULL;
|
||||
|
||||
|
@ -431,7 +431,7 @@ mach_init(argc, argv, envv)
|
|||
/*
|
||||
* Allocate space for proc0's USPACE.
|
||||
*/
|
||||
v = (caddr_t)uvm_pageboot_alloc(USPACE);
|
||||
v = (caddr_t)uvm_pageboot_alloc(USPACE);
|
||||
lwp0.l_addr = proc0paddr = (struct user *)v;
|
||||
lwp0.l_md.md_regs = (struct frame *)(v + USPACE) - 1;
|
||||
curpcb = &lwp0.l_addr->u_pcb;
|
||||
|
@ -443,7 +443,7 @@ mach_init(argc, argv, envv)
|
|||
* memory is directly addressable. We don't have to map these into
|
||||
* virtual address space.
|
||||
*/
|
||||
v = (caddr_t)uvm_pageboot_alloc(size);
|
||||
v = (caddr_t)uvm_pageboot_alloc(size);
|
||||
if ((allocsys(v, NULL) - v) != size)
|
||||
panic("mach_init: table size inconsistency");
|
||||
}
|
||||
|
@ -664,7 +664,7 @@ cpu_reboot(howto, bootstr)
|
|||
*/
|
||||
void
|
||||
arc_sysreset(addr, cmd_offset)
|
||||
bus_addr_t addr;
|
||||
bus_addr_t addr;
|
||||
bus_size_t cmd_offset;
|
||||
{
|
||||
volatile u_int8_t *kbdata = (u_int8_t *)addr + KBDATAP;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: minidebug.c,v 1.10 2000/06/29 08:34:09 mrg Exp $ */
|
||||
/* $NetBSD: minidebug.c,v 1.11 2003/01/19 10:06:13 tsutsui Exp $ */
|
||||
/* $OpenBSD: minidebug.c,v 1.2 1998/03/16 09:03:36 pefo Exp $ */
|
||||
|
||||
/*-
|
||||
|
@ -497,7 +497,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
|
|||
c = gethex(&newaddr, newaddr);
|
||||
if(c == '\n') {
|
||||
printf("= %02x",
|
||||
*(u_char *)newaddr);
|
||||
*(u_char *)newaddr);
|
||||
}
|
||||
break;
|
||||
case 'h':
|
||||
|
@ -505,7 +505,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
|
|||
c = gethex(&newaddr, newaddr);
|
||||
if(c == '\n') {
|
||||
printf("= %04x",
|
||||
*(u_short *)newaddr);
|
||||
*(u_short *)newaddr);
|
||||
}
|
||||
break;
|
||||
case 'w':
|
||||
|
@ -513,7 +513,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
|
|||
c = gethex(&newaddr, newaddr);
|
||||
if(c == '\n') {
|
||||
printf("= %08x",
|
||||
*(u_int *)newaddr);
|
||||
*(u_int *)newaddr);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
@ -529,7 +529,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
|
|||
if(c == ',') {
|
||||
c = gethex(&size, 0);
|
||||
if(c == '\n') {
|
||||
*(u_char *)newaddr = size;
|
||||
*(u_char *)newaddr = size;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -539,7 +539,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
|
|||
if(c == ',') {
|
||||
c = gethex(&size, 0);
|
||||
if(c == '\n') {
|
||||
*(u_short *)newaddr = size;
|
||||
*(u_short *)newaddr = size;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -549,7 +549,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
|
|||
if(c == ',') {
|
||||
c = gethex(&size, 0);
|
||||
if(c == '\n') {
|
||||
*(u_int *)newaddr = size;
|
||||
*(u_int *)newaddr = size;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -578,7 +578,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
|
|||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
#ifdef __OpenBSD__
|
||||
case 'w':
|
||||
printf("watch ");
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: opms.c,v 1.7 2002/11/26 19:50:21 christos Exp $ */
|
||||
/* $NetBSD: opms.c,v 1.8 2003/01/19 10:06:13 tsutsui Exp $ */
|
||||
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
|
||||
/* NetBSD: pms.c,v 1.21 1995/04/18 02:25:18 mycroft Exp */
|
||||
|
||||
|
@ -430,7 +430,7 @@ static void
|
|||
filt_opmsrdetach(struct knote *kn)
|
||||
{
|
||||
struct opms_softc *sc = kn->kn_hook;
|
||||
int s;
|
||||
int s;
|
||||
|
||||
s = spltty();
|
||||
SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pccons.c,v 1.31 2002/10/23 09:10:38 jdolecek Exp $ */
|
||||
/* $NetBSD: pccons.c,v 1.32 2003/01/19 10:06:13 tsutsui Exp $ */
|
||||
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
|
||||
/* NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp */
|
||||
|
||||
|
@ -651,7 +651,7 @@ pcpoll(dev, events, p)
|
|||
{
|
||||
struct pc_softc *sc = pc_cd.cd_devs[PCUNIT(dev)];
|
||||
struct tty *tp = sc->sc_tty;
|
||||
|
||||
|
||||
return ((*tp->t_linesw->l_poll)(tp, events, p));
|
||||
}
|
||||
|
||||
|
@ -909,7 +909,7 @@ pccnpollc(dev, on)
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Set line parameters.
|
||||
|
@ -942,7 +942,7 @@ static char bgansitopc[] = {
|
|||
};
|
||||
|
||||
static u_char iso2ibm437[] =
|
||||
{
|
||||
{
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
|
@ -1027,7 +1027,7 @@ sput(cp, n)
|
|||
switch (c) {
|
||||
case 0x1B:
|
||||
if (vs.state >= VSS_ESCAPE) {
|
||||
wrtchar(c, vs.so_at);
|
||||
wrtchar(c, vs.so_at);
|
||||
vs.state = 0;
|
||||
goto maybe_scroll;
|
||||
} else
|
||||
|
@ -1128,7 +1128,7 @@ sput(cp, n)
|
|||
vs.state = 0;
|
||||
break;
|
||||
default: /* Invalid, clear state */
|
||||
wrtchar(c, vs.so_at);
|
||||
wrtchar(c, vs.so_at);
|
||||
vs.state = 0;
|
||||
goto maybe_scroll;
|
||||
}
|
||||
|
@ -1166,7 +1166,7 @@ sput(cp, n)
|
|||
cx %= vs.nrow;
|
||||
pos = crtat - Crtat;
|
||||
pos += vs.ncol * cx;
|
||||
if (pos >= vs.nchr)
|
||||
if (pos >= vs.nchr)
|
||||
pos -= vs.nchr;
|
||||
crtat = Crtat + pos;
|
||||
vs.state = 0;
|
||||
|
@ -1417,7 +1417,7 @@ sput(cp, n)
|
|||
}
|
||||
vs.state = 0;
|
||||
break;
|
||||
|
||||
|
||||
default: /* Only numbers valid here */
|
||||
if ((c >= '0') && (c <= '9')) {
|
||||
if (vs.state >= VSS_EPARAM) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: btl.c,v 1.10 2002/10/02 04:59:47 thorpej Exp $ */
|
||||
/* $NetBSD: btl.c,v 1.11 2003/01/19 10:06:14 tsutsui Exp $ */
|
||||
/* NetBSD: bt.c,v 1.10 1996/05/12 23:51:54 mycroft Exp */
|
||||
|
||||
#undef BTDIAG
|
||||
|
@ -884,7 +884,7 @@ bt_done(sc, ccb)
|
|||
|
||||
if((datalen = xs->datalen) != 0) {
|
||||
thiskv = (int)xs->data;
|
||||
sg = ccb->scat_gath;
|
||||
sg = ccb->scat_gath;
|
||||
seg = phystol(ccb->data_length) / sizeof(struct bt_scat_gath);
|
||||
|
||||
while (seg) {
|
||||
|
@ -954,7 +954,7 @@ bt_find(ia, sc)
|
|||
#ifndef notyet
|
||||
/*
|
||||
* The BusLogic cards implement an Adaptec 1542 (aha)-compatible
|
||||
* interface. The native bha interface is not compatible with
|
||||
* interface. The native bha interface is not compatible with
|
||||
* an aha. 1542. We need to ensure that we never match an
|
||||
* Adaptec 1542. We must also avoid sending Adaptec-compatible
|
||||
* commands to a real bha, lest it go into 1542 emulation mode.
|
||||
|
@ -1356,7 +1356,7 @@ bt_scsi_cmd(xs)
|
|||
return COMPLETE;
|
||||
|
||||
badbuf:
|
||||
sg = ccb->scat_gath;
|
||||
sg = ccb->scat_gath;
|
||||
while (seg) {
|
||||
thisbounce = PHYSTOKV(phystol(sg->seg_addr));
|
||||
bt_free_buf(sc, (struct bt_buf *)thisbounce);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: isabus.c,v 1.17 2003/01/01 00:32:04 thorpej Exp $ */
|
||||
/* $NetBSD: isabus.c,v 1.18 2003/01/19 10:06:14 tsutsui Exp $ */
|
||||
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
|
||||
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
|
||||
|
||||
|
@ -288,7 +288,7 @@ isabr_intr_evcnt(ic, irq)
|
|||
/*
|
||||
* Establish a ISA bus interrupt.
|
||||
*/
|
||||
void *
|
||||
void *
|
||||
isabr_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
|
||||
isa_chipset_tag_t ic;
|
||||
int irq;
|
||||
|
@ -354,11 +354,11 @@ isabr_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
|
|||
return (ih);
|
||||
}
|
||||
|
||||
void
|
||||
void
|
||||
isabr_intr_disestablish(ic, arg)
|
||||
isa_chipset_tag_t ic;
|
||||
void *arg;
|
||||
{
|
||||
void *arg;
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
@ -410,12 +410,12 @@ isabr_iointr(mask, cf)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
/*
|
||||
* Initialize the Interrupt controller logic.
|
||||
*/
|
||||
void
|
||||
isabr_initicu()
|
||||
{
|
||||
{
|
||||
|
||||
isa_outb(IO_ICU1, 0x11); /* reset; program device, four bytes */
|
||||
isa_outb(IO_ICU1+1, 0); /* starting at this vector index */
|
||||
|
@ -424,7 +424,7 @@ isabr_initicu()
|
|||
isa_outb(IO_ICU1+1, 0xff); /* leave interrupts masked */
|
||||
isa_outb(IO_ICU1, 0x68); /* special mask mode (if available) */
|
||||
isa_outb(IO_ICU1, 0x0a); /* Read IRR by default. */
|
||||
#ifdef REORDER_IRQ
|
||||
#ifdef REORDER_IRQ
|
||||
isa_outb(IO_ICU1, 0xc0 | (3 - 1)); /* pri order 3-7, 0-2 (com2 first) */
|
||||
#endif
|
||||
|
||||
|
@ -435,7 +435,7 @@ isabr_initicu()
|
|||
isa_outb(IO_ICU2+1, 0xff); /* leave interrupts masked */
|
||||
isa_outb(IO_ICU2, 0x68); /* special mask mode (if available) */
|
||||
isa_outb(IO_ICU2, 0x0a); /* Read IRR by default. */
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: isadma_bounce.c,v 1.4 2001/11/14 18:15:14 thorpej Exp $ */
|
||||
/* $NetBSD: isadma_bounce.c,v 1.5 2003/01/19 10:06:14 tsutsui Exp $ */
|
||||
/* NetBSD: isadma_bounce.c,v 1.2 2000/06/01 05:49:36 thorpej Exp */
|
||||
|
||||
/*-
|
||||
|
@ -40,7 +40,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.4 2001/11/14 18:15:14 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.5 2003/01/19 10:06:14 tsutsui Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -312,7 +312,7 @@ isadma_bounce_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
|
|||
*/
|
||||
int
|
||||
isadma_bounce_dmamap_load_mbuf(bus_dma_tag_t t, bus_dmamap_t map,
|
||||
struct mbuf *m0, int flags)
|
||||
struct mbuf *m0, int flags)
|
||||
{
|
||||
struct isadma_bounce_cookie *cookie = map->_dm_cookie;
|
||||
int error;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: fd.c,v 1.10 2003/01/01 00:32:05 thorpej Exp $ */
|
||||
/* $NetBSD: fd.c,v 1.11 2003/01/19 10:06:15 tsutsui Exp $ */
|
||||
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
|
||||
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
|
||||
|
||||
|
@ -132,13 +132,20 @@ struct fd_type {
|
|||
|
||||
/* The order of entries in the following table is important -- BEWARE! */
|
||||
struct fd_type fd_types[] = {
|
||||
{ 18,2,36,2,0xff,0xcf,0x1b,0x6c,80,2880,1,FDC_500KBPS,"1.44MB" }, /* 1.44MB diskette */
|
||||
{ 15,2,30,2,0xff,0xdf,0x1b,0x54,80,2400,1,FDC_500KBPS, "1.2MB" }, /* 1.2 MB AT-diskettes */
|
||||
{ 9,2,18,2,0xff,0xdf,0x23,0x50,40, 720,2,FDC_300KBPS, "360KB/AT" }, /* 360kB in 1.2MB drive */
|
||||
{ 9,2,18,2,0xff,0xdf,0x2a,0x50,40, 720,1,FDC_250KBPS, "360KB/PC" }, /* 360kB PC diskettes */
|
||||
{ 9,2,18,2,0xff,0xdf,0x2a,0x50,80,1440,1,FDC_250KBPS, "720KB" }, /* 3.5" 720kB diskette */
|
||||
{ 9,2,18,2,0xff,0xdf,0x23,0x50,80,1440,1,FDC_300KBPS, "720KB/x" }, /* 720kB in 1.2MB drive */
|
||||
{ 9,2,18,2,0xff,0xdf,0x2a,0x50,40, 720,2,FDC_250KBPS, "360KB/x" }, /* 360kB in 720kB drive */
|
||||
/* 1.44MB diskette */
|
||||
{ 18,2,36,2,0xff,0xcf,0x1b,0x6c,80,2880,1,FDC_500KBPS,"1.44MB" },
|
||||
/* 1.2 MB AT-diskettes */
|
||||
{ 15,2,30,2,0xff,0xdf,0x1b,0x54,80,2400,1,FDC_500KBPS, "1.2MB" },
|
||||
/* 360kB in 1.2MB drive */
|
||||
{ 9,2,18,2,0xff,0xdf,0x23,0x50,40, 720,2,FDC_300KBPS, "360KB/AT" },
|
||||
/* 360kB PC diskettes */
|
||||
{ 9,2,18,2,0xff,0xdf,0x2a,0x50,40, 720,1,FDC_250KBPS, "360KB/PC" },
|
||||
/* 3.5" 720kB diskette */
|
||||
{ 9,2,18,2,0xff,0xdf,0x2a,0x50,80,1440,1,FDC_250KBPS, "720KB" },
|
||||
/* 720kB in 1.2MB drive */
|
||||
{ 9,2,18,2,0xff,0xdf,0x23,0x50,80,1440,1,FDC_300KBPS, "720KB/x" },
|
||||
/* 360kB in 720kB drive */
|
||||
{ 9,2,18,2,0xff,0xdf,0x2a,0x50,40, 720,2,FDC_250KBPS, "360KB/x" },
|
||||
};
|
||||
|
||||
/* software state, per disk (with up to 4 disks per ctlr) */
|
||||
|
@ -181,8 +188,7 @@ void fdattach __P((struct device *, struct device *, void *));
|
|||
|
||||
extern struct cfdriver fd_cd;
|
||||
|
||||
CFATTACH_DECL(fd, sizeof(struct fd_softc),
|
||||
fdprobe, fdattach, NULL, NULL);
|
||||
CFATTACH_DECL(fd, sizeof(struct fd_softc), fdprobe, fdattach, NULL, NULL);
|
||||
|
||||
dev_type_open(fdopen);
|
||||
dev_type_close(fdclose);
|
||||
|
@ -427,7 +433,7 @@ fdstrategy(bp)
|
|||
{
|
||||
struct fd_softc *fd = device_lookup(&fd_cd, FDUNIT(bp->b_dev));
|
||||
int sz;
|
||||
int s;
|
||||
int s;
|
||||
|
||||
/* Valid unit, controller, and request? */
|
||||
if (bp->b_blkno < 0 ||
|
||||
|
@ -458,7 +464,7 @@ fdstrategy(bp)
|
|||
}
|
||||
|
||||
bp->b_rawblkno = bp->b_blkno;
|
||||
bp->b_cylinder =
|
||||
bp->b_cylinder =
|
||||
bp->b_blkno / (FDC_BSIZE / DEV_BSIZE) / fd->sc_type->seccyl;
|
||||
|
||||
#ifdef FD_DEBUG
|
||||
|
@ -811,7 +817,7 @@ loop:
|
|||
fd = fdc->sc_drives.tqh_first;
|
||||
if (fd == NULL) {
|
||||
fdc->sc_state = DEVIDLE;
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Is there a transfer to this drive? If not, deactivate drive. */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: jazzdmatlb.c,v 1.7 2002/09/27 15:35:42 provos Exp $ */
|
||||
/* $NetBSD: jazzdmatlb.c,v 1.8 2003/01/19 10:06:15 tsutsui Exp $ */
|
||||
/* $OpenBSD: dma.c,v 1.5 1998/03/01 16:49:57 niklas Exp $ */
|
||||
|
||||
/*-
|
||||
|
@ -29,7 +29,7 @@
|
|||
|
||||
/*
|
||||
* Jazz derived system dma driver. Handles resource allocation and
|
||||
* logical (virtual) address remaping.
|
||||
* logical (virtual) address remaping.
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: jazzisabr.c,v 1.3 2002/10/02 04:59:49 thorpej Exp $ */
|
||||
/* $NetBSD: jazzisabr.c,v 1.4 2003/01/19 10:06:15 tsutsui Exp $ */
|
||||
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
|
||||
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
|
||||
|
||||
|
@ -71,9 +71,9 @@ jazzisabrmatch(parent, match, aux)
|
|||
{
|
||||
struct confargs *ca = aux;
|
||||
|
||||
/* Make sure that we're looking for a JAZZISABR. */
|
||||
if (strcmp(ca->ca_name, jazzisabr_cd.cd_name) != 0)
|
||||
return (0);
|
||||
/* Make sure that we're looking for a JAZZISABR. */
|
||||
if (strcmp(ca->ca_name, jazzisabr_cd.cd_name) != 0)
|
||||
return (0);
|
||||
|
||||
return (1);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pckbc_jazzio.c,v 1.7 2002/12/28 16:25:39 tsutsui Exp $ */
|
||||
/* $NetBSD: pckbc_jazzio.c,v 1.8 2003/01/19 10:06:15 tsutsui Exp $ */
|
||||
/* NetBSD: pckbc_isa.c,v 1.2 2000/03/23 07:01:35 thorpej Exp */
|
||||
|
||||
/*
|
||||
|
@ -37,7 +37,7 @@
|
|||
#include <sys/kernel.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/lock.h>
|
||||
|
|
Loading…
Reference in New Issue