The "easy" fixes for compiling the kernel -Wunused: remove unreferenced static
and local variables, goto labels, and functions declared but not defined.
This commit is contained in:
Archie Cobbs
parent
f769cca5eb
commit
f1d19042b0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=41591
@ -22,7 +22,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: elf_machdep.c,v 1.2 1998/10/09 20:38:03 peter Exp $
|
||||
* $Id: elf_machdep.c,v 1.3 1998/10/16 03:54:59 peter Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -42,7 +42,7 @@ elf_reloc(linker_file_t lf, const void *data, int type, const char *sym)
|
||||
{
|
||||
Elf_Addr relocbase = (Elf_Addr) lf->address;
|
||||
Elf_Addr *where;
|
||||
Elf_Addr addr, tmp_value;
|
||||
Elf_Addr addr;
|
||||
Elf_Addr addend;
|
||||
Elf_Word rtype;
|
||||
const Elf_Rel *rel;
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
|
||||
* $Id: npx.c,v 1.61 1998/06/21 18:02:39 bde Exp $
|
||||
* $Id: npx.c,v 1.62 1998/10/22 05:58:40 bde Exp $
|
||||
*/
|
||||
|
||||
#include "npx.h"
|
||||
@ -146,15 +146,17 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
|
||||
CTLFLAG_RD, &hw_float, 0,
|
||||
"Floatingpoint instructions executed in hardware");
|
||||
|
||||
static u_int npx0_imask = SWI_CLOCK_MASK;
|
||||
#ifndef SMP
|
||||
static u_int npx0_imask = SWI_CLOCK_MASK;
|
||||
static struct gate_descriptor npx_idt_probeintr;
|
||||
static volatile u_int npx_intrs_while_probing;
|
||||
static volatile u_int npx_traps_while_probing;
|
||||
#endif
|
||||
|
||||
static bool_t npx_ex16;
|
||||
static bool_t npx_exists;
|
||||
static struct gate_descriptor npx_idt_probeintr;
|
||||
static int npx_intrno;
|
||||
static volatile u_int npx_intrs_while_probing;
|
||||
static bool_t npx_irq13;
|
||||
static volatile u_int npx_traps_while_probing;
|
||||
|
||||
#ifndef SMP
|
||||
/*
|
||||
@ -249,8 +251,10 @@ static int
|
||||
npxprobe1(dvp)
|
||||
struct isa_device *dvp;
|
||||
{
|
||||
#ifndef SMP
|
||||
u_short control;
|
||||
u_short status;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Partially reset the coprocessor, if any. Some BIOS's don't reset
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
|
||||
* $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
|
||||
*/
|
||||
|
||||
#include "opt_smp.h"
|
||||
@ -2216,7 +2216,6 @@ void ap_init(void);
|
||||
void
|
||||
ap_init()
|
||||
{
|
||||
u_int temp;
|
||||
u_int apic_id;
|
||||
|
||||
smp_cpus++;
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
|
||||
* $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
|
||||
*/
|
||||
|
||||
#include "opt_smp.h"
|
||||
@ -2216,7 +2216,6 @@ void ap_init(void);
|
||||
void
|
||||
ap_init()
|
||||
{
|
||||
u_int temp;
|
||||
u_int apic_id;
|
||||
|
||||
smp_cpus++;
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
|
||||
* $Id: pmap.c,v 1.213 1998/11/24 20:25:52 eivind Exp $
|
||||
* $Id: pmap.c,v 1.214 1998/11/27 01:14:21 tegge Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -297,7 +297,9 @@ pmap_bootstrap(firstaddr, loadaddr)
|
||||
{
|
||||
vm_offset_t va;
|
||||
pt_entry_t *pte;
|
||||
#ifdef SMP
|
||||
int i, j;
|
||||
#endif
|
||||
|
||||
avail_start = firstaddr;
|
||||
|
||||
@ -1131,7 +1133,6 @@ pmap_swapin_proc(p)
|
||||
*/
|
||||
static int
|
||||
_pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) {
|
||||
int s;
|
||||
|
||||
while (vm_page_sleep(m, "pmuwpt", NULL));
|
||||
|
||||
@ -1262,7 +1263,6 @@ pmap_pinit(pmap)
|
||||
/*
|
||||
* allocate the page directory page
|
||||
*/
|
||||
retry:
|
||||
ptdpg = vm_page_grab( pmap->pm_pteobj, PTDPTDI,
|
||||
VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
|
||||
|
||||
@ -1296,7 +1296,6 @@ pmap_release_free_page(pmap, p)
|
||||
struct pmap *pmap;
|
||||
vm_page_t p;
|
||||
{
|
||||
int s;
|
||||
unsigned *pde = (unsigned *) pmap->pm_pdir;
|
||||
/*
|
||||
* This code optimizes the case of freeing non-busy
|
||||
@ -2439,7 +2438,6 @@ pmap_object_init_pt(pmap, addr, object, pindex, size, limit)
|
||||
((addr & (NBPDR - 1)) == 0) &&
|
||||
((size & (NBPDR - 1)) == 0) ) {
|
||||
int i;
|
||||
int s;
|
||||
vm_page_t m[1];
|
||||
unsigned int ptepindex;
|
||||
int npdes;
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
|
||||
* $Id: sys_machdep.c,v 1.36 1998/08/18 07:46:58 msmith Exp $
|
||||
* $Id: sys_machdep.c,v 1.37 1998/08/24 02:28:15 bde Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -124,7 +124,6 @@ i386_extend_pcb(struct proc *p)
|
||||
int i, offset;
|
||||
u_long *addr;
|
||||
struct pcb_ext *ext;
|
||||
struct segment_descriptor sd;
|
||||
struct soft_segment_descriptor ssd = {
|
||||
0, /* segment base address (overwritten) */
|
||||
ctob(IOPAGES + 1) - 1, /* length */
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
|
||||
* $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
|
||||
*/
|
||||
|
||||
#include "opt_smp.h"
|
||||
@ -2216,7 +2216,6 @@ void ap_init(void);
|
||||
void
|
||||
ap_init()
|
||||
{
|
||||
u_int temp;
|
||||
u_int apic_id;
|
||||
|
||||
smp_cpus++;
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
|
||||
* $Id: npx.c,v 1.61 1998/06/21 18:02:39 bde Exp $
|
||||
* $Id: npx.c,v 1.62 1998/10/22 05:58:40 bde Exp $
|
||||
*/
|
||||
|
||||
#include "npx.h"
|
||||
@ -146,15 +146,17 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
|
||||
CTLFLAG_RD, &hw_float, 0,
|
||||
"Floatingpoint instructions executed in hardware");
|
||||
|
||||
static u_int npx0_imask = SWI_CLOCK_MASK;
|
||||
#ifndef SMP
|
||||
static u_int npx0_imask = SWI_CLOCK_MASK;
|
||||
static struct gate_descriptor npx_idt_probeintr;
|
||||
static volatile u_int npx_intrs_while_probing;
|
||||
static volatile u_int npx_traps_while_probing;
|
||||
#endif
|
||||
|
||||
static bool_t npx_ex16;
|
||||
static bool_t npx_exists;
|
||||
static struct gate_descriptor npx_idt_probeintr;
|
||||
static int npx_intrno;
|
||||
static volatile u_int npx_intrs_while_probing;
|
||||
static bool_t npx_irq13;
|
||||
static volatile u_int npx_traps_while_probing;
|
||||
|
||||
#ifndef SMP
|
||||
/*
|
||||
@ -249,8 +251,10 @@ static int
|
||||
npxprobe1(dvp)
|
||||
struct isa_device *dvp;
|
||||
{
|
||||
#ifndef SMP
|
||||
u_short control;
|
||||
u_short status;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Partially reset the coprocessor, if any. Some BIOS's don't reset
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: adv_pci.c,v 1.1 1998/09/15 07:03:43 gibbs Exp $
|
||||
*/
|
||||
|
||||
#include <pci.h>
|
||||
@ -122,7 +122,6 @@ static void
|
||||
advpciattach(pcici_t config_id, int unit)
|
||||
{
|
||||
u_int16_t io_port;
|
||||
u_int16_t config_msw;
|
||||
struct adv_softc *adv;
|
||||
u_int32_t id;
|
||||
u_int32_t command;
|
||||
@ -252,9 +251,13 @@ advpciattach(pcici_t config_id, int unit)
|
||||
adv->max_dma_addr = ADV_PCI_MAX_DMA_ADDR;
|
||||
|
||||
#if CC_DISABLE_PCI_PARITY_INT
|
||||
config_msw = ADV_INW(adv, ADV_CONFIG_MSW);
|
||||
config_msw &= 0xFFC0;
|
||||
ADV_OUTW(adv, ADV_CONFIG_MSW, config_msw);
|
||||
{
|
||||
u_int16_t config_msw;
|
||||
|
||||
config_msw = ADV_INW(adv, ADV_CONFIG_MSW);
|
||||
config_msw &= 0xFFC0;
|
||||
ADV_OUTW(adv, ADV_CONFIG_MSW, config_msw);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (id == PCI_DEVICE_ID_ADVANSYS_1200A
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: advlib.c,v 1.8 1998/10/09 21:40:50 gibbs Exp $
|
||||
* $Id: advlib.c,v 1.9 1998/10/29 17:41:34 gibbs Exp $
|
||||
*/
|
||||
/*
|
||||
* Ported from:
|
||||
@ -2009,8 +2009,6 @@ adv_reset_bus(struct adv_softc *adv)
|
||||
|
||||
count = 0;
|
||||
while ((ccb = (union ccb *)LIST_FIRST(&adv->pending_ccbs)) != NULL) {
|
||||
struct adv_ccb_info *cinfo;
|
||||
|
||||
if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG)
|
||||
ccb->ccb_h.status |= CAM_SCSI_BUS_RESET;
|
||||
adv_done(adv, ccb, QD_ABORTED_BY_HOST, 0, 0, 0);
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: adw_pci.c,v 1.1 1998/10/07 03:20:49 gibbs Exp $
|
||||
*/
|
||||
|
||||
#include <pci.h>
|
||||
@ -89,7 +89,9 @@ adwpciattach(pcici_t config_id, int unit)
|
||||
u_int32_t id;
|
||||
u_int32_t command;
|
||||
vm_offset_t vaddr;
|
||||
#ifdef ADW_ALLOW_MEMIO
|
||||
vm_offset_t paddr;
|
||||
#endif
|
||||
u_int16_t io_port;
|
||||
bus_space_tag_t tag;
|
||||
bus_space_handle_t bsh;
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: ahc_pci.c,v 1.1 1998/09/15 07:25:33 gibbs Exp $
|
||||
* $Id: ahc_pci.c,v 1.2 1998/10/07 03:40:51 gibbs Exp $
|
||||
*/
|
||||
|
||||
#include <pci.h>
|
||||
@ -1172,7 +1172,6 @@ void
|
||||
ahc_pci_intr(struct ahc_softc *ahc)
|
||||
{
|
||||
u_int8_t status1;
|
||||
pcici_t config_id;
|
||||
|
||||
status1 = pci_cfgread(ahc->pci_config_id, PCIR_STATUS + 1, /*bytes*/1);
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: brooktree848.c,v 1.58 1998/11/07 14:30:48 nsouch Exp $ */
|
||||
/* $Id: brooktree848.c,v 1.59 1998/11/08 12:39:06 dfr Exp $ */
|
||||
/* BT848 Driver for Brooktree's Bt848 based cards.
|
||||
The Brooktree BT848 Driver driver is based upon Mark Tinguely and
|
||||
Jim Lowe's driver for the Matrox Meteor PCI card . The
|
||||
@ -1940,7 +1940,6 @@ bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr )
|
||||
static int
|
||||
video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr )
|
||||
{
|
||||
int tmp_int;
|
||||
bt848_ptr_t bt848;
|
||||
volatile u_char c_temp;
|
||||
unsigned int temp;
|
||||
@ -1951,7 +1950,6 @@ video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr )
|
||||
struct meteor_video *video;
|
||||
struct bktr_capture_area *cap_area;
|
||||
vm_offset_t buf;
|
||||
struct format_params *fp;
|
||||
int i;
|
||||
char char_temp;
|
||||
|
||||
@ -4495,7 +4493,7 @@ static void
|
||||
probeCard( bktr_ptr_t bktr, int verbose )
|
||||
{
|
||||
int card, i,j, card_found;
|
||||
int status, *test;
|
||||
int status;
|
||||
bt848_ptr_t bt848;
|
||||
u_char probe_signature[128], *probe_temp;
|
||||
int any_i2c_devices;
|
||||
@ -4737,7 +4735,6 @@ probeCard( bktr_ptr_t bktr, int verbose )
|
||||
|
||||
checkEnd:
|
||||
|
||||
checkPLL:
|
||||
#if defined( BKTR_USE_PLL )
|
||||
bktr->xtal_pll_mode = BT848_USE_PLL;
|
||||
goto checkPLLEnd;
|
||||
@ -4748,7 +4745,9 @@ probeCard( bktr_ptr_t bktr, int verbose )
|
||||
if ((card == CARD_HAUPPAUGE) &&
|
||||
(bktr->id==BROOKTREE_878_ID || bktr->id==BROOKTREE_879_ID) )
|
||||
bktr->xtal_pll_mode = BT848_USE_PLL;
|
||||
#if defined( BKTR_USE_PLL )
|
||||
checkPLLEnd:
|
||||
#endif
|
||||
|
||||
|
||||
bktr->card.tuner_pllAddr = tuner_i2c_address;
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* $Id: if_cs.c,v 1.5 1998/10/04 02:11:15 msmith Exp $
|
||||
* $Id: if_cs.c,v 1.6 1998/10/22 05:58:38 bde Exp $
|
||||
*
|
||||
* Device driver for Crystal Semiconductor CS8920 based ethernet
|
||||
* adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
|
||||
@ -190,7 +190,6 @@ get_eeprom_cksum(int off, int len, int *buffer)
|
||||
static int
|
||||
wait_eeprom_ready(struct cs_softc *sc)
|
||||
{
|
||||
int timeout=1000;
|
||||
DELAY ( 30000 ); /* XXX should we do some checks here ? */
|
||||
return 0;
|
||||
}
|
||||
@ -233,7 +232,6 @@ cs_duplex_auto(struct cs_softc *sc)
|
||||
static int
|
||||
enable_tp(struct cs_softc *sc)
|
||||
{
|
||||
int i;
|
||||
int unit = sc->arpcom.ac_if.if_unit;
|
||||
|
||||
cs_writereg(sc->nic_addr, PP_LineCTL, sc->line_ctl & ~AUI_ONLY);
|
||||
@ -254,7 +252,6 @@ enable_tp(struct cs_softc *sc)
|
||||
static int
|
||||
send_test_pkt(struct cs_softc *sc)
|
||||
{
|
||||
int unit = sc->arpcom.ac_if.if_unit;
|
||||
char test_packet[] = { 0,0,0,0,0,0, 0,0,0,0,0,0,
|
||||
0, 46, /* A 46 in network order */
|
||||
0, 0, /* DSAP=0 & SSAP=0 fields */
|
||||
@ -343,7 +340,7 @@ cs_cs89x0_probe(struct cs_softc *sc, u_int *dev_irq,
|
||||
int *dev_drq, int iobase, int unit, int flags)
|
||||
{
|
||||
unsigned rev_type = 0;
|
||||
int i, irq=0, result;
|
||||
int i, irq=0;
|
||||
int eeprom_buff[CHKSUM_LEN];
|
||||
int chip_type, pp_isaint, pp_isadma;
|
||||
char chip_revision;
|
||||
@ -646,7 +643,7 @@ cs_init(void *xsc)
|
||||
{
|
||||
struct cs_softc *sc=(struct cs_softc *)xsc;
|
||||
struct ifnet *ifp = &sc->arpcom.ac_if;
|
||||
int i, s, result, rx_cfg;
|
||||
int i, s, rx_cfg;
|
||||
|
||||
/* address not known */
|
||||
if (TAILQ_EMPTY(&ifp->if_addrhead)) /* unlikely? XXX */
|
||||
@ -816,7 +813,7 @@ static void
|
||||
csintr_sc(struct cs_softc *sc, int unit)
|
||||
{
|
||||
struct ifnet *ifp = &(sc->arpcom.ac_if);
|
||||
int status, s;
|
||||
int status;
|
||||
|
||||
#ifdef CS_DEBUG
|
||||
printf(CS_NAME"%1d: Interrupt.\n", unit);
|
||||
@ -1306,7 +1303,6 @@ csintr_pnp_add(struct cs_softc *sc, int unit)
|
||||
static void
|
||||
csintr_pnp(int unit)
|
||||
{
|
||||
struct cs_softc *sc;
|
||||
struct csintr_list *intr;
|
||||
|
||||
for (intr=csintr_head; intr; intr=intr->next) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* dgb.c $Id: dgb.c,v 1.39 1998/08/16 01:21:49 bde Exp $
|
||||
* dgb.c $Id: dgb.c,v 1.40 1998/08/23 08:26:39 bde Exp $
|
||||
*
|
||||
* Digiboard driver.
|
||||
*
|
||||
@ -407,10 +407,8 @@ dgbprobe(dev)
|
||||
struct isa_device *dev;
|
||||
{
|
||||
struct dgb_softc *sc= &dgb_softc[dev->id_unit];
|
||||
int i, v, t;
|
||||
int i, v;
|
||||
u_long win_size; /* size of vizible memory window */
|
||||
u_char *mem;
|
||||
int addr;
|
||||
int unit=dev->id_unit;
|
||||
|
||||
sc->unit=dev->id_unit;
|
||||
@ -525,7 +523,6 @@ dgbattach(dev)
|
||||
int addr;
|
||||
struct dgb_p *port;
|
||||
volatile struct board_chan *bc;
|
||||
struct global_data *gd;
|
||||
int shrinkmem;
|
||||
int nfails;
|
||||
ushort *pstat;
|
||||
@ -1283,7 +1280,6 @@ dgbpoll(unit_c)
|
||||
int rhead, rtail;
|
||||
int whead, wtail;
|
||||
int size;
|
||||
int c=0;
|
||||
u_char *ptr;
|
||||
int ocount;
|
||||
int ibuf_full,obuf_full;
|
||||
@ -1512,7 +1508,6 @@ dgbpoll(unit_c)
|
||||
setwin(sc,0);
|
||||
}
|
||||
}
|
||||
end_of_buffer: ;
|
||||
}
|
||||
bc->idata=1; /* require event on incoming data */
|
||||
|
||||
@ -1957,7 +1952,6 @@ dgbparam(tp, t)
|
||||
struct termios *t;
|
||||
{
|
||||
int dev=tp->t_dev;
|
||||
int mynor=minor(dev);
|
||||
int unit=MINOR_TO_UNIT(dev);
|
||||
int pnum=MINOR_TO_PORT(dev);
|
||||
struct dgb_softc *sc=&dgb_softc[unit];
|
||||
@ -1968,7 +1962,7 @@ dgbparam(tp, t)
|
||||
int mval;
|
||||
int iflag;
|
||||
int hflow;
|
||||
int s,cs;
|
||||
int cs;
|
||||
|
||||
BoardMemWinState ws=bmws_get();
|
||||
|
||||
@ -2170,7 +2164,6 @@ dgbstop(tp, rw)
|
||||
struct dgb_p *port;
|
||||
struct dgb_softc *sc;
|
||||
volatile struct board_chan *bc;
|
||||
int head;
|
||||
int s;
|
||||
|
||||
BoardMemWinState ws=bmws_get();
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* $Id: dgm.c,v 1.4 1998/08/16 01:21:49 bde Exp $
|
||||
* $Id: dgm.c,v 1.5 1998/08/23 08:26:40 bde Exp $
|
||||
*
|
||||
* This driver and the associated header files support the ISA PC/Xem
|
||||
* Digiboards. Its evolutionary roots are described below.
|
||||
@ -381,9 +381,7 @@ dgmprobe(dev)
|
||||
struct isa_device *dev;
|
||||
{
|
||||
struct dgm_softc *sc= &dgm_softc[dev->id_unit];
|
||||
int i, v, t;
|
||||
u_char *mem;
|
||||
int addr;
|
||||
int i, v;
|
||||
int unit=dev->id_unit;
|
||||
|
||||
sc->unit=dev->id_unit;
|
||||
@ -449,14 +447,9 @@ dgmattach(dev)
|
||||
int addr;
|
||||
struct dgm_p *port;
|
||||
volatile struct board_chan *bc;
|
||||
struct global_data *gd;
|
||||
int shrinkmem;
|
||||
int nfails;
|
||||
ushort *pstat;
|
||||
int lowwater;
|
||||
static int nports=0;
|
||||
char ch;
|
||||
int stuff;
|
||||
|
||||
if(sc->status!=ENABLED) {
|
||||
DPRINT2(DB_EXCEPT,"dbg%d: try to attach a disabled card\n",unit);
|
||||
@ -1087,7 +1080,6 @@ dgmpoll(unit_c)
|
||||
int rhead, rtail;
|
||||
int whead, wtail;
|
||||
int size;
|
||||
int c=0;
|
||||
u_char *ptr;
|
||||
int ocount;
|
||||
int ibuf_full,obuf_full;
|
||||
@ -1316,7 +1308,6 @@ dgmpoll(unit_c)
|
||||
setwin(sc,0);
|
||||
}
|
||||
}
|
||||
end_of_buffer: ;
|
||||
}
|
||||
bc->idata=1; /* require event on incoming data */
|
||||
|
||||
@ -1761,7 +1752,6 @@ dgmparam(tp, t)
|
||||
struct termios *t;
|
||||
{
|
||||
int dev=tp->t_dev;
|
||||
int mynor=minor(dev);
|
||||
int unit=MINOR_TO_UNIT(dev);
|
||||
int pnum=MINOR_TO_PORT(dev);
|
||||
struct dgm_softc *sc=&dgm_softc[unit];
|
||||
@ -1772,7 +1762,7 @@ dgmparam(tp, t)
|
||||
int mval;
|
||||
int iflag;
|
||||
int hflow;
|
||||
int s,cs;
|
||||
int cs;
|
||||
|
||||
BoardMemWinState ws=bmws_get();
|
||||
|
||||
@ -1975,7 +1965,6 @@ dgmstop(tp, rw)
|
||||
struct dgm_p *port;
|
||||
struct dgm_softc *sc;
|
||||
volatile struct board_chan *bc;
|
||||
int head;
|
||||
int s;
|
||||
|
||||
BoardMemWinState ws=bmws_get();
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
* dptpci.c: PCI Bus Attachment for DPT SCSI HBAs
|
||||
*/
|
||||
|
||||
#ident "$Id: dpt_pci.c,v 1.8 1998/09/15 08:33:38 gibbs Exp $"
|
||||
#ident "$Id: dpt_pci.c,v 1.9 1998/10/07 03:40:51 gibbs Exp $"
|
||||
|
||||
#include "opt_devfs.h"
|
||||
#include "opt_dpt.h"
|
||||
@ -112,14 +112,13 @@ dpt_pci_attach(pcici_t config_id, int unit)
|
||||
{
|
||||
dpt_softc_t *dpt;
|
||||
vm_offset_t vaddr;
|
||||
#ifdef DPT_ALLOW_MEMIO
|
||||
vm_offset_t paddr;
|
||||
#endif
|
||||
u_int16_t io_base;
|
||||
bus_space_tag_t tag;
|
||||
bus_space_handle_t bsh;
|
||||
u_int32_t command;
|
||||
u_int32_t data;
|
||||
int result;
|
||||
int ndx;
|
||||
int s;
|
||||
|
||||
vaddr = NULL;
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
|
||||
* $Id: fd.c,v 1.124 1998/10/22 05:58:38 bde Exp $
|
||||
* $Id: fd.c,v 1.125 1998/12/04 22:54:46 archie Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -1299,7 +1299,6 @@ fdintr(fdcu_t fdcu)
|
||||
static int
|
||||
fdstate(fdcu_t fdcu, fdc_p fdc)
|
||||
{
|
||||
struct subdev *sd;
|
||||
int read, format, head, i, sec = 0, sectrac, st0, cyl, st3;
|
||||
unsigned blknum = 0, b_cylinder = 0;
|
||||
fdu_t fdu = fdc->fdu;
|
||||
@ -1743,10 +1742,8 @@ static int
|
||||
retrier(fdcu)
|
||||
fdcu_t fdcu;
|
||||
{
|
||||
struct subdev *sd;
|
||||
fdc_p fdc = fdc_data + fdcu;
|
||||
register struct buf *bp;
|
||||
int fdu;
|
||||
|
||||
bp = bufq_first(&fdc->head);
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* $Id: if_fe.c,v 1.42 1998/06/21 16:51:06 bde Exp $
|
||||
* $Id: if_fe.c,v 1.43 1998/10/22 05:58:39 bde Exp $
|
||||
*
|
||||
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
|
||||
* To be used with FreeBSD 2.x
|
||||
@ -395,7 +395,6 @@ feinit(struct pccard_devinfo *devi)
|
||||
static void
|
||||
feunload(struct pccard_devinfo *devi)
|
||||
{
|
||||
struct fe_softc *sc = &fe_softc[devi->isahd.id_unit];
|
||||
printf("fe%d: unload\n", devi->isahd.id_unit);
|
||||
fe_stop(devi->isahd.id_unit);
|
||||
}
|
||||
@ -1209,7 +1208,7 @@ fe_probe_gwy ( DEVICE * dev, struct fe_softc * sc )
|
||||
static int
|
||||
fe_probe_mbh ( DEVICE * dev, struct fe_softc * sc )
|
||||
{
|
||||
int i,type;
|
||||
int i;
|
||||
|
||||
static struct fe_simple_probe_struct probe_table [] = {
|
||||
{ FE_DLCR0, 0x09, 0x00 },
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: if_ic.c,v 1.1.1.1 1998/09/03 20:51:50 nsouch Exp $
|
||||
* $Id: if_ic.c,v 1.2 1998/10/31 11:31:07 nsouch Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -290,7 +290,6 @@ icintr (device_t dev, int event, char *ptr)
|
||||
int unit = device_get_unit(dev);
|
||||
int s, len;
|
||||
struct mbuf *top;
|
||||
int i;
|
||||
|
||||
s = splhigh();
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: iic.c,v 1.3 1998/09/09 18:57:24 nsouch Exp $
|
||||
* $Id: iic.c,v 1.4 1998/10/31 11:31:07 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
#include <sys/param.h>
|
||||
@ -117,8 +117,6 @@ iic_probe(device_t dev)
|
||||
static int
|
||||
iic_attach(device_t dev)
|
||||
{
|
||||
struct iic_softc *sc = (struct iic_softc *)device_get_softc(dev);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: iicbus.c,v 1.4 1998/11/08 18:42:34 nsouch Exp $
|
||||
* $Id: iicbus.c,v 1.5 1998/11/22 22:01:42 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -125,8 +125,6 @@ iicbus_probe(device_t dev)
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int iicdev_found[LAST_SLAVE_ADDR+1];
|
||||
|
||||
static int
|
||||
iic_probe_device(device_t dev, u_char addr)
|
||||
{
|
||||
@ -155,11 +153,9 @@ iic_probe_device(device_t dev, u_char addr)
|
||||
static int
|
||||
iicbus_attach(device_t dev)
|
||||
{
|
||||
struct iicbus_softc *sc = device_get_softc(dev);
|
||||
struct iicbus_device *iicdev;
|
||||
device_t child;
|
||||
int addr, count;
|
||||
char byte;
|
||||
int addr;
|
||||
|
||||
iicbus_reset(dev, IIC_FASTEST, 0, NULL);
|
||||
|
||||
@ -265,8 +261,6 @@ iicbus_read_ivar(device_t bus, device_t dev, int index, u_long* result)
|
||||
static int
|
||||
iicbus_write_ivar(device_t bus, device_t dev, int index, u_long val)
|
||||
{
|
||||
struct iicbus_device* iicdev = DEVTOIICBUS(dev);
|
||||
|
||||
switch (index) {
|
||||
default:
|
||||
return (ENOENT);
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: pcf.c,v 1.4 1998/10/31 14:23:09 peter Exp $
|
||||
* $Id: pcf.c,v 1.5 1998/11/04 22:09:17 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
#include <sys/param.h>
|
||||
@ -149,7 +149,6 @@ pcfprobe_isa(struct isa_device *dvp)
|
||||
{
|
||||
device_t pcfdev;
|
||||
struct pcf_isa_softc *pcf;
|
||||
int error;
|
||||
|
||||
if (npcf >= MAXPCF)
|
||||
return (0);
|
||||
@ -172,7 +171,6 @@ pcfprobe_isa(struct isa_device *dvp)
|
||||
if (!pcfdev)
|
||||
goto error;
|
||||
|
||||
end_probe:
|
||||
return (1);
|
||||
|
||||
error:
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: lpbb.c,v 1.1 1998/10/31 11:35:21 nsouch Exp $
|
||||
* $Id: lpbb.c,v 1.2 1998/11/09 22:22:01 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -133,7 +133,6 @@ lpbb_probe(device_t dev)
|
||||
static int
|
||||
lpbb_attach(device_t dev)
|
||||
{
|
||||
struct lpbb_softc *sc = (struct lpbb_softc *)device_get_softc(dev);
|
||||
device_t bitbang, iicbus;
|
||||
|
||||
/* add generic bit-banging code */
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: ppbconf.c,v 1.7 1998/09/13 18:26:26 nsouch Exp $
|
||||
* $Id: ppbconf.c,v 1.8 1998/09/20 14:41:54 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
#include <sys/param.h>
|
||||
@ -257,7 +257,6 @@ ppb_pnp_detect(struct ppb_data *ppb)
|
||||
int
|
||||
ppb_attachdevs(struct ppb_data *ppb)
|
||||
{
|
||||
int error;
|
||||
struct ppb_device *dev;
|
||||
struct ppb_driver **p_drvpp, *p_drvp;
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: ppi.c,v 1.6 1998/01/02 09:30:39 msmith Exp $
|
||||
* $Id: ppi.c,v 1.7 1998/06/07 17:09:49 dfr Exp $
|
||||
*
|
||||
*/
|
||||
#include "ppi.h"
|
||||
@ -116,8 +116,6 @@ ppiprobe(struct ppb_data *ppb)
|
||||
static int
|
||||
ppiattach(struct ppb_device *dev)
|
||||
{
|
||||
struct ppi_data *ppi = ppidata[dev->id_unit];
|
||||
|
||||
/*
|
||||
* Report ourselves
|
||||
*/
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
|
||||
* ----------------------------------------------------------------------------
|
||||
*
|
||||
* $Id: pps.c,v 1.10 1998/08/03 19:14:31 msmith Exp $
|
||||
* $Id: pps.c,v 1.11 1998/08/24 16:31:27 phk Exp $
|
||||
*
|
||||
* This driver implements a draft-mogul-pps-api-02.txt PPS source.
|
||||
*
|
||||
@ -153,7 +153,6 @@ ppsintr(int unit)
|
||||
{
|
||||
struct pps_data *sc = softc[unit];
|
||||
struct timespec tc;
|
||||
struct timeval tv;
|
||||
|
||||
nanotime(&tc);
|
||||
if (!(ppb_rstr(&sc->pps_dev) & nACK))
|
||||
@ -171,6 +170,8 @@ ppsintr(int unit)
|
||||
sc->ppsinfo.assert_sequence++;
|
||||
#ifdef PPS_SYNC
|
||||
if (sc->ppsparam.mode & PPS_HARDPPSONASSERT) {
|
||||
struct timeval tv;
|
||||
|
||||
tv.tv_sec = tc.tv_sec;
|
||||
tv.tv_usec = tc.tv_nsec / 1000;
|
||||
hardpps(&tv, tv.tv_usec);
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: vpo.c,v 1.4 1997/09/01 00:51:52 bde Exp $
|
||||
* $Id: vpo.c,v 1.8 1998/09/20 14:41:54 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -157,7 +157,6 @@ vpoprobe(struct ppb_data *ppb)
|
||||
static int
|
||||
vpoattach(struct ppb_device *dev)
|
||||
{
|
||||
struct scsibus_data *scbus;
|
||||
struct vpo_data *vpo = vpodata[dev->id_unit];
|
||||
struct cam_devq *devq;
|
||||
|
||||
@ -211,9 +210,11 @@ vpoattach(struct ppb_device *dev)
|
||||
static void
|
||||
vpo_intr(struct vpo_data *vpo, struct ccb_scsiio *csio)
|
||||
{
|
||||
|
||||
int i, errno; /* error in errno.h */
|
||||
int errno; /* error in errno.h */
|
||||
int s;
|
||||
#ifdef VP0_DEBUG
|
||||
int i;
|
||||
#endif
|
||||
|
||||
s = splcam();
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: vpoio.c,v 1.2 1998/09/13 18:26:26 nsouch Exp $
|
||||
* $Id: vpoio.c,v 1.3 1998/09/20 14:41:54 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -449,10 +449,7 @@ vpoio_outstr(struct vpoio_data *vpo, char *buffer, int size)
|
||||
static int
|
||||
vpoio_instr(struct vpoio_data *vpo, char *buffer, int size)
|
||||
{
|
||||
|
||||
register int k;
|
||||
int error = 0;
|
||||
int r, mode, epp;
|
||||
|
||||
ppb_MS_exec(&vpo->vpo_dev, MS_OP_GET, buffer, size, MS_UNKNOWN, &error);
|
||||
|
||||
@ -488,7 +485,6 @@ vpoio_instr(struct vpoio_data *vpo, char *buffer, int size)
|
||||
static char
|
||||
vpoio_select(struct vpoio_data *vpo, int initiator, int target)
|
||||
{
|
||||
register int k;
|
||||
int ret;
|
||||
|
||||
struct ppb_microseq select_microseq[] = {
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: ppc.c,v 1.10 1998/10/22 05:58:40 bde Exp $
|
||||
* $Id: ppc.c,v 1.11 1998/10/31 11:37:09 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
#include "ppc.h"
|
||||
@ -240,7 +240,7 @@ static int
|
||||
ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_mode) /* XXX mode never forced */
|
||||
{
|
||||
static int index = 0;
|
||||
int base, idport, irq;
|
||||
int idport, irq;
|
||||
int ptr, pcr, val, i;
|
||||
|
||||
while ((idport = pc873xx_basetab[index++])) {
|
||||
@ -701,7 +701,7 @@ static int w83877f_hefs[] = { WINB_HEFERE, WINB_HEFRAS, WINB_HEFERE | WINB_HEFRA
|
||||
static int
|
||||
ppc_w83877f_detect(struct ppc_data *ppc, int chipset_mode)
|
||||
{
|
||||
int i, j, efer, base;
|
||||
int i, j, efer;
|
||||
unsigned char r, hefere, hefras;
|
||||
|
||||
for (i = 0; i < 4; i ++) {
|
||||
@ -876,8 +876,6 @@ ppc_w83877f_detect(struct ppc_data *ppc, int chipset_mode)
|
||||
static int
|
||||
ppc_generic_detect(struct ppc_data *ppc, int chipset_mode)
|
||||
{
|
||||
char save_control;
|
||||
|
||||
/* default to generic */
|
||||
ppc->ppc_link.adapter = &ppc_generic_adapter;
|
||||
|
||||
@ -1308,7 +1306,6 @@ ppcprobe(struct isa_device *dvp)
|
||||
{
|
||||
static short next_bios_ppc = 0;
|
||||
struct ppc_data *ppc;
|
||||
int error;
|
||||
|
||||
/*
|
||||
* If port not specified, use bios list.
|
||||
@ -1370,8 +1367,6 @@ ppcprobe(struct isa_device *dvp)
|
||||
if (ppc_detect(ppc, dvp->id_flags & 0xf))
|
||||
goto error;
|
||||
|
||||
end_probe:
|
||||
|
||||
return (1);
|
||||
|
||||
error:
|
||||
@ -1383,7 +1378,6 @@ ppcattach(struct isa_device *isdp)
|
||||
{
|
||||
struct ppc_data *ppc = ppcdata[isdp->id_unit];
|
||||
struct ppb_data *ppbus;
|
||||
char * mode;
|
||||
|
||||
printf("ppc%d: %s chipset (%s) in %s mode%s\n", ppc->ppc_unit,
|
||||
ppc_types[ppc->ppc_type], ppc_avms[ppc->ppc_avm],
|
||||
|
||||
@ -809,10 +809,11 @@ static struct cdevsw rp_cdevsw = {
|
||||
|
||||
static int rp_controller_port = 0;
|
||||
static int rp_num_ports_open = 0;
|
||||
static int rp_timeout;
|
||||
static int ndevs = 0;
|
||||
static int minor_to_unit[128];
|
||||
#if 0
|
||||
static struct tty rp_tty[128];
|
||||
#endif
|
||||
|
||||
static int rp_num_ports[4]; /* Number of ports on each controller */
|
||||
|
||||
@ -858,7 +859,7 @@ static _INLINE_ void rp_do_receive(struct rp_port *rp, struct tty *tp,
|
||||
{
|
||||
int spl;
|
||||
unsigned int CharNStat;
|
||||
int ToRecv, wRecv, ch;
|
||||
int ToRecv, ch;
|
||||
|
||||
ToRecv = sGetRxCnt(cp);
|
||||
if(ToRecv == 0)
|
||||
@ -924,7 +925,7 @@ static _INLINE_ void rp_handle_port(struct rp_port *rp)
|
||||
CHANNEL_t *cp;
|
||||
struct tty *tp;
|
||||
unsigned int IntMask, ChanStatus;
|
||||
int oldcts, ToRecv;
|
||||
/* int oldcts; */
|
||||
|
||||
if(!rp)
|
||||
return;
|
||||
@ -1023,9 +1024,8 @@ int
|
||||
rpprobe(dev)
|
||||
struct isa_device *dev;
|
||||
{
|
||||
struct isa_device *idev;
|
||||
int controller, unit;
|
||||
int i, aiop, num_aiops;
|
||||
int aiop, num_aiops;
|
||||
unsigned int aiopio[MAX_AIOPS_PER_BOARD];
|
||||
CONTROLLER_t *ctlp;
|
||||
|
||||
@ -1070,7 +1070,7 @@ static void
|
||||
rp_pciattach(pcici_t tag, int unit)
|
||||
{
|
||||
dev_t rp_dev;
|
||||
int success, rpmajor, oldspl;
|
||||
int success, oldspl;
|
||||
u_short iobase;
|
||||
int num_ports, num_chan, num_aiops;
|
||||
int aiop, chan, port;
|
||||
@ -1079,7 +1079,6 @@ rp_pciattach(pcici_t tag, int unit)
|
||||
struct rp_port *rp;
|
||||
struct tty *tty;
|
||||
CONTROLLER_t *ctlp;
|
||||
char status;
|
||||
|
||||
success = pci_map_port(tag, 0x10, &iobase);
|
||||
if(!success)
|
||||
@ -1183,7 +1182,7 @@ struct isa_device *dev;
|
||||
{
|
||||
struct isa_device *idev;
|
||||
dev_t rp_dev;
|
||||
int iobase, unit, rpmajor, oldspl;
|
||||
int iobase, unit, /*rpmajor,*/ oldspl;
|
||||
int num_ports, num_chan, num_aiops;
|
||||
int aiop, chan, port;
|
||||
int ChanStatus, line, i, count;
|
||||
@ -1191,7 +1190,6 @@ struct isa_device *dev;
|
||||
struct rp_port *rp;
|
||||
struct tty *tty;
|
||||
CONTROLLER_t *ctlp;
|
||||
char status;
|
||||
|
||||
iobase = dev->id_iobase;
|
||||
unit = dev->id_unit;
|
||||
@ -1303,7 +1301,7 @@ rpopen(dev, flag, mode, p)
|
||||
struct proc *p;
|
||||
{
|
||||
struct rp_port *rp;
|
||||
int unit, i, port, mynor, umynor, flags; /* SG */
|
||||
int unit, port, mynor, umynor, flags; /* SG */
|
||||
struct tty *tp;
|
||||
int oldspl, error;
|
||||
unsigned int IntMask, ChanStatus;
|
||||
@ -1450,7 +1448,7 @@ rpclose(dev, flag, mode, p)
|
||||
int flag, mode;
|
||||
struct proc *p;
|
||||
{
|
||||
int oldspl, unit, mynor, umynor, port, status, i; /* SG */
|
||||
int oldspl, unit, mynor, umynor, port; /* SG */
|
||||
struct rp_port *rp;
|
||||
struct tty *tp;
|
||||
CHANNEL_t *cp;
|
||||
@ -1483,7 +1481,7 @@ rpclose(dev, flag, mode, p)
|
||||
static void
|
||||
rphardclose(struct rp_port *rp)
|
||||
{
|
||||
int status, oldspl, mynor;
|
||||
int mynor;
|
||||
struct tty *tp;
|
||||
CHANNEL_t *cp;
|
||||
|
||||
@ -1525,7 +1523,7 @@ rpread(dev, uio, flag)
|
||||
{
|
||||
struct rp_port *rp;
|
||||
struct tty *tp;
|
||||
int unit, i, mynor, umynor, port, error = 0; /* SG */
|
||||
int unit, mynor, umynor, port, error = 0; /* SG */
|
||||
|
||||
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
|
||||
port = (minor(dev) & 0x1f); /* SG */
|
||||
@ -1549,7 +1547,7 @@ rpwrite(dev, uio, flag)
|
||||
{
|
||||
struct rp_port *rp;
|
||||
struct tty *tp;
|
||||
int unit, i, mynor, port, umynor, error = 0; /* SG */
|
||||
int unit, mynor, port, umynor, error = 0; /* SG */
|
||||
|
||||
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
|
||||
port = (minor(dev) & 0x1f); /* SG */
|
||||
@ -1594,9 +1592,8 @@ rpioctl(dev, cmd, data, flag, p)
|
||||
CHANNEL_t *cp;
|
||||
struct tty *tp;
|
||||
int unit, mynor, port, umynor; /* SG */
|
||||
int oldspl, cflag, iflag, oflag, lflag;
|
||||
int i, error = 0;
|
||||
char status;
|
||||
int oldspl;
|
||||
int error = 0;
|
||||
int arg, flags, result, ChanStatus;
|
||||
int oldcmd;
|
||||
struct termios term, *t;
|
||||
@ -1804,9 +1801,9 @@ rpparam(tp, t)
|
||||
{
|
||||
struct rp_port *rp;
|
||||
CHANNEL_t *cp;
|
||||
int unit, i, mynor, port, umynor; /* SG */
|
||||
int unit, mynor, port, umynor; /* SG */
|
||||
int oldspl, cflag, iflag, oflag, lflag;
|
||||
int ospeed, flags;
|
||||
int ospeed;
|
||||
|
||||
|
||||
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
|
||||
@ -1942,10 +1939,10 @@ rpstart(tp)
|
||||
struct rp_port *rp;
|
||||
CHANNEL_t *cp;
|
||||
struct clist *qp;
|
||||
int unit, i, mynor, port, umynor; /* SG */
|
||||
char status, ch, flags;
|
||||
int unit, mynor, port, umynor; /* SG */
|
||||
char ch, flags;
|
||||
int spl, xmit_fifo_room;
|
||||
int count, ToRecv;
|
||||
int count;
|
||||
|
||||
|
||||
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
|
||||
@ -2002,11 +1999,8 @@ rpstop(tp, flag)
|
||||
{
|
||||
struct rp_port *rp;
|
||||
CHANNEL_t *cp;
|
||||
struct clist *qp;
|
||||
int unit, mynor, port, umynor; /* SG */
|
||||
char status, ch;
|
||||
int spl, xmit_fifo_room;
|
||||
int i, count;
|
||||
int spl;
|
||||
|
||||
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
|
||||
port = (minor(tp->t_dev) & 0x1f); /* SG */
|
||||
@ -2044,7 +2038,7 @@ struct tty *
|
||||
rpdevtotty(dev_t dev)
|
||||
{
|
||||
struct rp_port *rp;
|
||||
int unit, i, port, mynor, umynor; /* SG */
|
||||
int unit, port, mynor, umynor; /* SG */
|
||||
|
||||
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
|
||||
port = (minor(dev) & 0x1f); /* SG */
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: smb.c,v 1.2 1998/09/04 17:53:42 nsouch Exp $
|
||||
* $Id: smb.c,v 1.3 1998/09/09 18:57:38 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
#include <sys/param.h>
|
||||
@ -119,8 +119,6 @@ smb_probe(device_t dev)
|
||||
static int
|
||||
smb_attach(device_t dev)
|
||||
{
|
||||
struct smb_softc *sc = (struct smb_softc *)device_get_softc(dev);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -161,7 +159,7 @@ smbwrite(dev_t dev, struct uio * uio, int ioflag)
|
||||
{
|
||||
device_t smbdev = IIC_DEVICE(minor(dev));
|
||||
struct smb_softc *sc = IIC_SOFTC(minor(dev));
|
||||
int error, count;
|
||||
int count;
|
||||
|
||||
if (!sc || !smbdev)
|
||||
return (EINVAL);
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: smbus.c,v 1.2 1998/10/31 11:39:54 nsouch Exp $
|
||||
* $Id: smbus.c,v 1.3 1998/11/22 22:01:42 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
#include <sys/param.h>
|
||||
@ -107,10 +107,10 @@ smbus_probe(device_t dev)
|
||||
static int
|
||||
smbus_attach(device_t dev)
|
||||
{
|
||||
struct smbus_device *smbdev;
|
||||
device_t child;
|
||||
char byte;
|
||||
u_short addr;
|
||||
#if 0
|
||||
struct smbus_device *smbdev;
|
||||
#endif
|
||||
|
||||
bus_generic_attach(dev);
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: scvesactl.c,v 1.5 1998/09/26 03:38:40 yokota Exp $
|
||||
* $Id: scvesactl.c,v 1.6 1998/10/01 11:39:17 yokota Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
@ -52,11 +52,8 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
|
||||
{
|
||||
scr_stat *scp;
|
||||
struct tty *tp;
|
||||
video_info_t info;
|
||||
video_adapter_t *adp;
|
||||
int mode;
|
||||
int error;
|
||||
int s;
|
||||
|
||||
tp = scdevtotty(dev);
|
||||
if (!tp)
|
||||
@ -84,7 +81,6 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
|
||||
if (!(adp->va_flags & V_ADP_MODECHANGE))
|
||||
return ENODEV;
|
||||
mode = (cmd & 0xff) + M_VESA_BASE;
|
||||
vesa_text:
|
||||
return sc_set_text_mode(scp, tp, mode, 0, 0, 0);
|
||||
|
||||
/* graphics modes */
|
||||
@ -112,7 +108,6 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
|
||||
if (!(adp->va_flags & V_ADP_MODECHANGE))
|
||||
return ENODEV;
|
||||
mode = (cmd & 0xff) + M_VESA_BASE;
|
||||
vesa_graphics:
|
||||
return sc_set_graphics_mode(scp, tp, mode);
|
||||
}
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: syscons.c,v 1.286 1998/11/03 02:37:46 yokota Exp $
|
||||
* $Id: syscons.c,v 1.287 1998/11/08 12:39:02 dfr Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
@ -640,7 +640,9 @@ static int
|
||||
scattach(struct isa_device *dev)
|
||||
{
|
||||
scr_stat *scp;
|
||||
#if defined(VESA) && defined(VM86)
|
||||
video_info_t info;
|
||||
#endif
|
||||
dev_t cdev = makedev(CDEV_MAJOR, 0);
|
||||
#ifdef DEVFS
|
||||
int vc;
|
||||
@ -924,7 +926,6 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
|
||||
int i;
|
||||
struct tty *tp;
|
||||
scr_stat *scp;
|
||||
video_adapter_t *adp;
|
||||
int s;
|
||||
|
||||
tp = scdevtotty(dev);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* $OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */
|
||||
/* $Id: if_tx.c,v 1.16 1998/11/01 07:44:33 semenu Exp $ */
|
||||
/* $Id: if_tx.c,v 1.17 1998/11/09 09:34:00 peter Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
|
||||
@ -407,8 +407,7 @@ epic_freebsd_attach(
|
||||
#else
|
||||
caddr_t pmembase;
|
||||
#endif
|
||||
int i,k,s,tmp;
|
||||
u_int32_t pool;
|
||||
int i,s,tmp;
|
||||
|
||||
printf("tx%d",unit);
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
||||
* THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: if_vr.c,v 1.1 1998/12/04 18:01:21 wpaul Exp $
|
||||
* $Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -96,8 +96,8 @@
|
||||
#include <pci/if_vrreg.h>
|
||||
|
||||
#ifndef lint
|
||||
static char rcsid[] =
|
||||
"$Id: if_vr.c,v 1.1 1998/12/04 18:01:21 wpaul Exp $";
|
||||
static const char rcsid[] =
|
||||
"$Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $";
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: if_wl.c,v 1.16 1998/10/22 05:58:39 bde Exp $ */
|
||||
/* $Id: if_wl.c,v 1.17 1998/11/15 19:30:48 eivind Exp $ */
|
||||
/*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
@ -311,7 +311,6 @@ static void wlmmcstat(int unit);
|
||||
static u_short wlbldru(int unit);
|
||||
static u_short wlmmcread(u_int base, u_short reg);
|
||||
static void wlinitmmc(int unit);
|
||||
static void wlsetirq(int base, int irq);
|
||||
static int wlhwrst(int unit);
|
||||
static void wlrustrt(int unit);
|
||||
static void wlbldcu(int unit);
|
||||
@ -365,7 +364,6 @@ wlprobe(struct isa_device *id)
|
||||
{
|
||||
struct wl_softc *sc = &wl_softc[id->id_unit];
|
||||
register short base = id->id_iobase;
|
||||
int unit = id->id_unit;
|
||||
char *str = "wl%d: board out of range [0..%d]\n";
|
||||
u_char inbuf[100];
|
||||
unsigned long oldpri;
|
||||
@ -723,8 +721,6 @@ static int
|
||||
wlhwrst(int unit)
|
||||
{
|
||||
register struct wl_softc *sc = WLSOFTC(unit);
|
||||
int i;
|
||||
short base = sc->base;
|
||||
|
||||
#ifdef WLDEBUG
|
||||
if (sc->wl_if.if_flags & IFF_DEBUG)
|
||||
@ -1171,7 +1167,6 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
short base = sc->base;
|
||||
short mode = 0;
|
||||
int opri, error = 0;
|
||||
u_short tmp;
|
||||
struct proc *p = curproc; /* XXX */
|
||||
int irq, irqval, i, isroot, size;
|
||||
caddr_t up;
|
||||
@ -1479,11 +1474,8 @@ wlintr(unit)
|
||||
int unit;
|
||||
{
|
||||
register struct wl_softc *sc = &wl_softc[unit];
|
||||
scb_t scb;
|
||||
ac_t cb;
|
||||
short base = sc->base;
|
||||
int next, x, opri;
|
||||
int i, ac_status;
|
||||
int ac_status;
|
||||
u_short int_type, int_type1;
|
||||
|
||||
#ifdef WLDEBUG
|
||||
@ -2328,7 +2320,6 @@ static void
|
||||
wlsftwsleaze(u_short *countp, u_char **mb_pp, struct mbuf **tm_pp, int unit)
|
||||
{
|
||||
struct mbuf *tm_p = *tm_pp;
|
||||
u_char *mb_p = *mb_pp;
|
||||
u_short count = 0;
|
||||
u_char *cp = (u_char *) t_packet;
|
||||
int len;
|
||||
@ -2387,10 +2378,6 @@ wlmmcread(u_int base, u_short reg)
|
||||
static void
|
||||
getsnr(int unit)
|
||||
{
|
||||
register struct wl_softc *sc = WLSOFTC(unit);
|
||||
short base = sc->base;
|
||||
register int s;
|
||||
|
||||
MMC_WRITE(MMC_FREEZE,1);
|
||||
/*
|
||||
* SNR retrieval procedure :
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
*
|
||||
* @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94
|
||||
*
|
||||
* $Id: fdesc_vnops.c,v 1.37 1998/06/10 21:21:28 dfr Exp $
|
||||
* $Id: fdesc_vnops.c,v 1.38 1998/06/14 08:46:41 bde Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -84,8 +84,6 @@ static int fdesc_attr __P((int fd, struct vattr *vap, struct ucred *cred,
|
||||
struct proc *p));
|
||||
static int fdesc_badop __P((void));
|
||||
static int fdesc_getattr __P((struct vop_getattr_args *ap));
|
||||
static struct fdcache *
|
||||
fdesc_hash __P((int ix));
|
||||
static int fdesc_inactive __P((struct vop_inactive_args *ap));
|
||||
static int fdesc_ioctl __P((struct vop_ioctl_args *ap));
|
||||
static int fdesc_lookup __P((struct vop_lookup_args *ap));
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: msdosfs_denode.c,v 1.41 1998/11/10 09:16:29 peter Exp $ */
|
||||
/* $Id: msdosfs_denode.c,v 1.42 1998/11/21 00:20:24 dt Exp $ */
|
||||
/* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */
|
||||
|
||||
/*-
|
||||
@ -417,7 +417,6 @@ detrunc(dep, length, flags, cred, p)
|
||||
int isadir = dep->de_Attributes & ATTR_DIRECTORY;
|
||||
struct buf *bp;
|
||||
struct msdosfsmount *pmp = dep->de_pmp;
|
||||
struct timespec ts;
|
||||
|
||||
#ifdef MSDOSFS_DEBUG
|
||||
printf("detrunc(): file %s, length %lu, flags %x\n", dep->de_Name, length, flags);
|
||||
@ -560,7 +559,6 @@ deextend(dep, length, cred)
|
||||
struct msdosfsmount *pmp = dep->de_pmp;
|
||||
u_long count;
|
||||
int error;
|
||||
struct timespec ts;
|
||||
|
||||
/*
|
||||
* The root of a DOS filesystem cannot be extended.
|
||||
@ -666,7 +664,6 @@ msdosfs_inactive(ap)
|
||||
struct denode *dep = VTODE(vp);
|
||||
struct proc *p = ap->a_p;
|
||||
int error = 0;
|
||||
struct timespec ts;
|
||||
|
||||
#ifdef MSDOSFS_DEBUG
|
||||
printf("msdosfs_inactive(): dep %p, de_Name[0] %x\n", dep, dep->de_Name[0]);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: msdosfs_lookup.c,v 1.25 1998/05/18 10:24:26 dt Exp $ */
|
||||
/* $Id: msdosfs_lookup.c,v 1.26 1998/09/13 15:40:31 dt Exp $ */
|
||||
/* $NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $ */
|
||||
|
||||
/*-
|
||||
@ -61,9 +61,6 @@
|
||||
#include <msdosfs/msdosfsmount.h>
|
||||
#include <msdosfs/fat.h>
|
||||
|
||||
static int markdeleted __P((struct msdosfsmount *pmp, u_long dirclust,
|
||||
u_long diroffset));
|
||||
|
||||
/*
|
||||
* When we search a directory the blocks containing directory entries are
|
||||
* read and examined. The directory entries contain information that would
|
||||
@ -109,7 +106,6 @@ msdosfs_lookup(ap)
|
||||
struct msdosfsmount *pmp;
|
||||
struct buf *bp = 0;
|
||||
struct direntry *dep = NULL;
|
||||
struct ucred *cred = cnp->cn_cred;
|
||||
u_char dosfilename[12];
|
||||
int flags = cnp->cn_flags;
|
||||
int nameiop = cnp->cn_nameiop;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: msdosfs_vfsops.c,v 1.37 1998/10/25 19:26:18 bde Exp $ */
|
||||
/* $Id: msdosfs_vfsops.c,v 1.38 1998/10/31 15:31:24 peter Exp $ */
|
||||
/* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */
|
||||
|
||||
/*-
|
||||
@ -365,6 +365,7 @@ mountmsdosfs(devvp, mp, p, argp)
|
||||
dev_t dev = devvp->v_rdev;
|
||||
#ifndef __FreeBSD__
|
||||
struct partinfo dpart;
|
||||
int bsize = 0, dtype = 0, tmp;
|
||||
#endif
|
||||
union bootsector *bsp;
|
||||
struct byte_bpb33 *b33;
|
||||
@ -372,7 +373,6 @@ mountmsdosfs(devvp, mp, p, argp)
|
||||
struct byte_bpb710 *b710;
|
||||
u_int8_t SecPerClust;
|
||||
int ronly, error;
|
||||
int bsize = 0, dtype = 0, tmp;
|
||||
|
||||
/*
|
||||
* Disallow multiple mounts of the same device.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: msdosfs_vnops.c,v 1.78 1998/11/21 00:20:24 dt Exp $ */
|
||||
/* $Id: msdosfs_vnops.c,v 1.79 1998/11/29 22:38:57 dt Exp $ */
|
||||
/* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */
|
||||
|
||||
/*-
|
||||
@ -329,7 +329,6 @@ msdosfs_getattr(ap)
|
||||
struct proc *a_p;
|
||||
} */ *ap;
|
||||
{
|
||||
u_int cn;
|
||||
struct denode *dep = VTODE(ap->a_vp);
|
||||
struct msdosfsmount *pmp = dep->de_pmp;
|
||||
struct vattr *vap = ap->a_vap;
|
||||
@ -1798,7 +1797,6 @@ msdosfs_bmap(ap)
|
||||
} */ *ap;
|
||||
{
|
||||
struct denode *dep = VTODE(ap->a_vp);
|
||||
struct msdosfsmount *pmp = dep->de_pmp;
|
||||
|
||||
if (ap->a_vpp != NULL)
|
||||
*ap->a_vpp = dep->de_devvp;
|
||||
|
||||
@ -37,11 +37,11 @@
|
||||
*
|
||||
* Ancestors:
|
||||
* @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92
|
||||
* $Id: null_vnops.c,v 1.28 1998/06/10 06:34:56 peter Exp $
|
||||
* $Id: null_vnops.c,v 1.29 1998/07/04 20:45:33 julian Exp $
|
||||
* ...and...
|
||||
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
|
||||
*
|
||||
* $Id: null_vnops.c,v 1.28 1998/06/10 06:34:56 peter Exp $
|
||||
* $Id: null_vnops.c,v 1.29 1998/07/04 20:45:33 julian Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -523,8 +523,6 @@ null_unlock(ap)
|
||||
struct proc *a_p;
|
||||
} */ *ap;
|
||||
{
|
||||
struct vnode *vp = ap->a_vp;
|
||||
|
||||
vop_nounlock(ap);
|
||||
ap->a_flags &= ~LK_INTERLOCK;
|
||||
return (null_bypass((struct vop_generic_args *)ap));
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
*
|
||||
* @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95
|
||||
*
|
||||
* $Id: portal_vnops.c,v 1.32 1998/06/10 06:34:57 peter Exp $
|
||||
* $Id: portal_vnops.c,v 1.33 1998/06/10 21:21:31 dfr Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -445,7 +445,6 @@ portal_getattr(ap)
|
||||
{
|
||||
struct vnode *vp = ap->a_vp;
|
||||
struct vattr *vap = ap->a_vap;
|
||||
struct timeval tv;
|
||||
|
||||
bzero(vap, sizeof(*vap));
|
||||
vattr_null(vap);
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
|
||||
* $Id: spec_vnops.c,v 1.75 1998/10/26 08:53:13 bde Exp $
|
||||
* $Id: spec_vnops.c,v 1.76 1998/10/31 15:31:24 peter Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -605,7 +605,6 @@ spec_close(ap)
|
||||
} */ *ap;
|
||||
{
|
||||
register struct vnode *vp = ap->a_vp;
|
||||
struct proc *p = ap->a_p;
|
||||
dev_t dev = vp->v_rdev;
|
||||
d_close_t *devclose;
|
||||
int mode, error;
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95
|
||||
* $Id: umap_vnops.c,v 1.24 1998/07/04 20:45:34 julian Exp $
|
||||
* $Id: umap_vnops.c,v 1.25 1998/07/30 17:40:45 bde Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -386,8 +386,6 @@ umap_unlock(ap)
|
||||
struct proc *a_p;
|
||||
} */ *ap;
|
||||
{
|
||||
struct vnode *vp = ap->a_vp;
|
||||
|
||||
vop_nounlock(ap);
|
||||
ap->a_flags &= ~LK_INTERLOCK;
|
||||
return (null_bypass((struct vop_generic_args *)ap));
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)union_subr.c 8.20 (Berkeley) 5/20/95
|
||||
* $Id: union_subr.c,v 1.33 1998/11/15 15:33:51 bde Exp $
|
||||
* $Id: union_subr.c,v 1.34 1998/12/07 02:47:46 eivind Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -310,7 +310,6 @@ union_allocvp(vpp, mp, undvp, dvp, cnp, uppervp, lowervp, docache)
|
||||
int hash;
|
||||
int vflag;
|
||||
int try;
|
||||
int klocked;
|
||||
|
||||
if (uppervp == NULLVP && lowervp == NULLVP)
|
||||
panic("union: unidentifiable allocation");
|
||||
|
||||
@ -52,7 +52,11 @@
|
||||
#include <ufs/ufs/quota.h>
|
||||
#include <ufs/ufs/inode.h>
|
||||
|
||||
#include "opt_ddb.h"
|
||||
|
||||
#ifdef DDB
|
||||
static void ext2_checkoverlap __P((struct buf *, struct inode *));
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Return buffer with the contents of block "offset" from the beginning of
|
||||
@ -88,7 +92,6 @@ ext2_blkatoff(vp, offset, res, bpp)
|
||||
return (0);
|
||||
}
|
||||
|
||||
#include "opt_ddb.h"
|
||||
#ifdef DDB
|
||||
static void
|
||||
ext2_checkoverlap(bp, ip)
|
||||
|
||||
@ -893,7 +893,6 @@ ext2_sync(mp, waitfor, cred, p)
|
||||
struct inode *ip;
|
||||
struct ufsmount *ump = VFSTOUFS(mp);
|
||||
struct ext2_sb_info *fs;
|
||||
struct timeval tv;
|
||||
int error, allerror = 0;
|
||||
|
||||
fs = ump->um_e2fs;
|
||||
@ -1171,7 +1170,7 @@ ext2_sbupdate(mp, waitfor)
|
||||
register struct ext2_sb_info *fs = mp->um_e2fs;
|
||||
register struct ext2_super_block *es = fs->s_es;
|
||||
register struct buf *bp;
|
||||
int i, error = 0;
|
||||
int error = 0;
|
||||
/*
|
||||
printf("\nupdating superblock, waitfor=%s\n", waitfor == MNT_WAIT ? "yes":"no");
|
||||
*/
|
||||
|
||||
@ -52,7 +52,11 @@
|
||||
#include <ufs/ufs/quota.h>
|
||||
#include <ufs/ufs/inode.h>
|
||||
|
||||
#include "opt_ddb.h"
|
||||
|
||||
#ifdef DDB
|
||||
static void ext2_checkoverlap __P((struct buf *, struct inode *));
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Return buffer with the contents of block "offset" from the beginning of
|
||||
@ -88,7 +92,6 @@ ext2_blkatoff(vp, offset, res, bpp)
|
||||
return (0);
|
||||
}
|
||||
|
||||
#include "opt_ddb.h"
|
||||
#ifdef DDB
|
||||
static void
|
||||
ext2_checkoverlap(bp, ip)
|
||||
|
||||
@ -893,7 +893,6 @@ ext2_sync(mp, waitfor, cred, p)
|
||||
struct inode *ip;
|
||||
struct ufsmount *ump = VFSTOUFS(mp);
|
||||
struct ext2_sb_info *fs;
|
||||
struct timeval tv;
|
||||
int error, allerror = 0;
|
||||
|
||||
fs = ump->um_e2fs;
|
||||
@ -1171,7 +1170,7 @@ ext2_sbupdate(mp, waitfor)
|
||||
register struct ext2_sb_info *fs = mp->um_e2fs;
|
||||
register struct ext2_super_block *es = fs->s_es;
|
||||
register struct buf *bp;
|
||||
int i, error = 0;
|
||||
int error = 0;
|
||||
/*
|
||||
printf("\nupdating superblock, waitfor=%s\n", waitfor == MNT_WAIT ? "yes":"no");
|
||||
*/
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* dgb.c $Id: dgb.c,v 1.39 1998/08/16 01:21:49 bde Exp $
|
||||
* dgb.c $Id: dgb.c,v 1.40 1998/08/23 08:26:39 bde Exp $
|
||||
*
|
||||
* Digiboard driver.
|
||||
*
|
||||
@ -407,10 +407,8 @@ dgbprobe(dev)
|
||||
struct isa_device *dev;
|
||||
{
|
||||
struct dgb_softc *sc= &dgb_softc[dev->id_unit];
|
||||
int i, v, t;
|
||||
int i, v;
|
||||
u_long win_size; /* size of vizible memory window */
|
||||
u_char *mem;
|
||||
int addr;
|
||||
int unit=dev->id_unit;
|
||||
|
||||
sc->unit=dev->id_unit;
|
||||
@ -525,7 +523,6 @@ dgbattach(dev)
|
||||
int addr;
|
||||
struct dgb_p *port;
|
||||
volatile struct board_chan *bc;
|
||||
struct global_data *gd;
|
||||
int shrinkmem;
|
||||
int nfails;
|
||||
ushort *pstat;
|
||||
@ -1283,7 +1280,6 @@ dgbpoll(unit_c)
|
||||
int rhead, rtail;
|
||||
int whead, wtail;
|
||||
int size;
|
||||
int c=0;
|
||||
u_char *ptr;
|
||||
int ocount;
|
||||
int ibuf_full,obuf_full;
|
||||
@ -1512,7 +1508,6 @@ dgbpoll(unit_c)
|
||||
setwin(sc,0);
|
||||
}
|
||||
}
|
||||
end_of_buffer: ;
|
||||
}
|
||||
bc->idata=1; /* require event on incoming data */
|
||||
|
||||
@ -1957,7 +1952,6 @@ dgbparam(tp, t)
|
||||
struct termios *t;
|
||||
{
|
||||
int dev=tp->t_dev;
|
||||
int mynor=minor(dev);
|
||||
int unit=MINOR_TO_UNIT(dev);
|
||||
int pnum=MINOR_TO_PORT(dev);
|
||||
struct dgb_softc *sc=&dgb_softc[unit];
|
||||
@ -1968,7 +1962,7 @@ dgbparam(tp, t)
|
||||
int mval;
|
||||
int iflag;
|
||||
int hflow;
|
||||
int s,cs;
|
||||
int cs;
|
||||
|
||||
BoardMemWinState ws=bmws_get();
|
||||
|
||||
@ -2170,7 +2164,6 @@ dgbstop(tp, rw)
|
||||
struct dgb_p *port;
|
||||
struct dgb_softc *sc;
|
||||
volatile struct board_chan *bc;
|
||||
int head;
|
||||
int s;
|
||||
|
||||
BoardMemWinState ws=bmws_get();
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* $Id: dgm.c,v 1.4 1998/08/16 01:21:49 bde Exp $
|
||||
* $Id: dgm.c,v 1.5 1998/08/23 08:26:40 bde Exp $
|
||||
*
|
||||
* This driver and the associated header files support the ISA PC/Xem
|
||||
* Digiboards. Its evolutionary roots are described below.
|
||||
@ -381,9 +381,7 @@ dgmprobe(dev)
|
||||
struct isa_device *dev;
|
||||
{
|
||||
struct dgm_softc *sc= &dgm_softc[dev->id_unit];
|
||||
int i, v, t;
|
||||
u_char *mem;
|
||||
int addr;
|
||||
int i, v;
|
||||
int unit=dev->id_unit;
|
||||
|
||||
sc->unit=dev->id_unit;
|
||||
@ -449,14 +447,9 @@ dgmattach(dev)
|
||||
int addr;
|
||||
struct dgm_p *port;
|
||||
volatile struct board_chan *bc;
|
||||
struct global_data *gd;
|
||||
int shrinkmem;
|
||||
int nfails;
|
||||
ushort *pstat;
|
||||
int lowwater;
|
||||
static int nports=0;
|
||||
char ch;
|
||||
int stuff;
|
||||
|
||||
if(sc->status!=ENABLED) {
|
||||
DPRINT2(DB_EXCEPT,"dbg%d: try to attach a disabled card\n",unit);
|
||||
@ -1087,7 +1080,6 @@ dgmpoll(unit_c)
|
||||
int rhead, rtail;
|
||||
int whead, wtail;
|
||||
int size;
|
||||
int c=0;
|
||||
u_char *ptr;
|
||||
int ocount;
|
||||
int ibuf_full,obuf_full;
|
||||
@ -1316,7 +1308,6 @@ dgmpoll(unit_c)
|
||||
setwin(sc,0);
|
||||
}
|
||||
}
|
||||
end_of_buffer: ;
|
||||
}
|
||||
bc->idata=1; /* require event on incoming data */
|
||||
|
||||
@ -1761,7 +1752,6 @@ dgmparam(tp, t)
|
||||
struct termios *t;
|
||||
{
|
||||
int dev=tp->t_dev;
|
||||
int mynor=minor(dev);
|
||||
int unit=MINOR_TO_UNIT(dev);
|
||||
int pnum=MINOR_TO_PORT(dev);
|
||||
struct dgm_softc *sc=&dgm_softc[unit];
|
||||
@ -1772,7 +1762,7 @@ dgmparam(tp, t)
|
||||
int mval;
|
||||
int iflag;
|
||||
int hflow;
|
||||
int s,cs;
|
||||
int cs;
|
||||
|
||||
BoardMemWinState ws=bmws_get();
|
||||
|
||||
@ -1975,7 +1965,6 @@ dgmstop(tp, rw)
|
||||
struct dgm_p *port;
|
||||
struct dgm_softc *sc;
|
||||
volatile struct board_chan *bc;
|
||||
int head;
|
||||
int s;
|
||||
|
||||
BoardMemWinState ws=bmws_get();
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: elf_machdep.c,v 1.2 1998/10/09 20:38:03 peter Exp $
|
||||
* $Id: elf_machdep.c,v 1.3 1998/10/16 03:54:59 peter Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -42,7 +42,7 @@ elf_reloc(linker_file_t lf, const void *data, int type, const char *sym)
|
||||
{
|
||||
Elf_Addr relocbase = (Elf_Addr) lf->address;
|
||||
Elf_Addr *where;
|
||||
Elf_Addr addr, tmp_value;
|
||||
Elf_Addr addr;
|
||||
Elf_Addr addend;
|
||||
Elf_Word rtype;
|
||||
const Elf_Rel *rel;
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
|
||||
* $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
|
||||
*/
|
||||
|
||||
#include "opt_smp.h"
|
||||
@ -2216,7 +2216,6 @@ void ap_init(void);
|
||||
void
|
||||
ap_init()
|
||||
{
|
||||
u_int temp;
|
||||
u_int apic_id;
|
||||
|
||||
smp_cpus++;
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
|
||||
* $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
|
||||
*/
|
||||
|
||||
#include "opt_smp.h"
|
||||
@ -2216,7 +2216,6 @@ void ap_init(void);
|
||||
void
|
||||
ap_init()
|
||||
{
|
||||
u_int temp;
|
||||
u_int apic_id;
|
||||
|
||||
smp_cpus++;
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: perfmon.c,v 1.14 1997/12/28 17:33:01 phk Exp $
|
||||
* $Id: perfmon.c,v 1.15 1997/12/29 23:36:56 phk Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -46,8 +46,10 @@ static int msr_pmc[NPMC];
|
||||
static unsigned int ctl_shadow[NPMC];
|
||||
static quad_t pmc_shadow[NPMC]; /* used when ctr is stopped on P5 */
|
||||
static int (*writectl)(int);
|
||||
#ifndef SMP
|
||||
static int writectl5(int);
|
||||
static int writectl6(int);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Must be called after cpu_class is set up.
|
||||
@ -195,6 +197,7 @@ perfmon_reset(int pmc)
|
||||
return EBUSY;
|
||||
}
|
||||
|
||||
#ifndef SMP
|
||||
/*
|
||||
* Unfortunately, the performance-monitoring registers are laid out
|
||||
* differently in the P5 and P6. We keep everything in P6 format
|
||||
@ -245,6 +248,7 @@ writectl5(int pmc)
|
||||
wrmsr(msr_ctl[0], newval);
|
||||
return 0; /* XXX should check for unimplemented bits */
|
||||
}
|
||||
#endif /* !SMP */
|
||||
|
||||
/*
|
||||
* Now the user-mode interface, called from a subdevice of mem.c.
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
|
||||
* $Id: pmap.c,v 1.213 1998/11/24 20:25:52 eivind Exp $
|
||||
* $Id: pmap.c,v 1.214 1998/11/27 01:14:21 tegge Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -297,7 +297,9 @@ pmap_bootstrap(firstaddr, loadaddr)
|
||||
{
|
||||
vm_offset_t va;
|
||||
pt_entry_t *pte;
|
||||
#ifdef SMP
|
||||
int i, j;
|
||||
#endif
|
||||
|
||||
avail_start = firstaddr;
|
||||
|
||||
@ -1131,7 +1133,6 @@ pmap_swapin_proc(p)
|
||||
*/
|
||||
static int
|
||||
_pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) {
|
||||
int s;
|
||||
|
||||
while (vm_page_sleep(m, "pmuwpt", NULL));
|
||||
|
||||
@ -1262,7 +1263,6 @@ pmap_pinit(pmap)
|
||||
/*
|
||||
* allocate the page directory page
|
||||
*/
|
||||
retry:
|
||||
ptdpg = vm_page_grab( pmap->pm_pteobj, PTDPTDI,
|
||||
VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
|
||||
|
||||
@ -1296,7 +1296,6 @@ pmap_release_free_page(pmap, p)
|
||||
struct pmap *pmap;
|
||||
vm_page_t p;
|
||||
{
|
||||
int s;
|
||||
unsigned *pde = (unsigned *) pmap->pm_pdir;
|
||||
/*
|
||||
* This code optimizes the case of freeing non-busy
|
||||
@ -2439,7 +2438,6 @@ pmap_object_init_pt(pmap, addr, object, pindex, size, limit)
|
||||
((addr & (NBPDR - 1)) == 0) &&
|
||||
((size & (NBPDR - 1)) == 0) ) {
|
||||
int i;
|
||||
int s;
|
||||
vm_page_t m[1];
|
||||
unsigned int ptepindex;
|
||||
int npdes;
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
|
||||
* $Id: sys_machdep.c,v 1.36 1998/08/18 07:46:58 msmith Exp $
|
||||
* $Id: sys_machdep.c,v 1.37 1998/08/24 02:28:15 bde Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -124,7 +124,6 @@ i386_extend_pcb(struct proc *p)
|
||||
int i, offset;
|
||||
u_long *addr;
|
||||
struct pcb_ext *ext;
|
||||
struct segment_descriptor sd;
|
||||
struct soft_segment_descriptor ssd = {
|
||||
0, /* segment base address (overwritten) */
|
||||
ctob(IOPAGES + 1) - 1, /* length */
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
**
|
||||
** $Id: userconfig.c,v 1.115 1998/11/04 13:37:43 peter Exp $
|
||||
** $Id: userconfig.c,v 1.116 1998/12/04 18:01:23 wpaul Exp $
|
||||
**/
|
||||
|
||||
/**
|
||||
@ -154,7 +154,7 @@ getchar(void)
|
||||
{
|
||||
static const char *asp;
|
||||
static int assize; /* use of int for -ve magic value */
|
||||
static int autocheck = 0, signon = 0;
|
||||
static int autocheck = 0;
|
||||
caddr_t autoentry, autoattr;
|
||||
int c;
|
||||
static int intro = 0;
|
||||
@ -2458,7 +2458,7 @@ visuserconfig(void)
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: userconfig.c,v 1.115 1998/11/04 13:37:43 peter Exp $
|
||||
* $Id: userconfig.c,v 1.116 1998/12/04 18:01:23 wpaul Exp $
|
||||
*/
|
||||
|
||||
#include "scbus.h"
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: vm86.c,v 1.17 1998/09/29 20:36:31 ache Exp $
|
||||
* $Id: vm86.c,v 1.18 1998/09/29 22:06:33 ache Exp $
|
||||
*/
|
||||
|
||||
#include "opt_vm86.h"
|
||||
@ -359,7 +359,6 @@ vm86_initialize(void)
|
||||
struct vm86_layout *vml = (struct vm86_layout *)vm86paddr;
|
||||
struct pcb *pcb;
|
||||
struct pcb_ext *ext;
|
||||
struct segment_descriptor sd;
|
||||
struct soft_segment_descriptor ssd = {
|
||||
0, /* segment base address (overwritten) */
|
||||
0, /* length (overwritten) */
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
|
||||
* $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
|
||||
*/
|
||||
|
||||
#include "opt_smp.h"
|
||||
@ -2216,7 +2216,6 @@ void ap_init(void);
|
||||
void
|
||||
ap_init()
|
||||
{
|
||||
u_int temp;
|
||||
u_int apic_id;
|
||||
|
||||
smp_cpus++;
|
||||
|
||||
@ -522,7 +522,6 @@ static int sync_clock2 (int unit, long period)
|
||||
static int alog_attach (struct isa_device *idp)
|
||||
{
|
||||
int unit = idp->id_unit; /* this device unit number */
|
||||
int iobase = idp->id_iobase; /* the base address of the unit */
|
||||
talog_unit *info; /* pointer to driver specific info for unit */
|
||||
int chan; /* the channel used for creating devfs nodes */
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: atapi-cd.c,v 1.4 1998/10/30 10:57:09 luigi Exp $
|
||||
* $Id: atapi-cd.c,v 1.5 1998/11/21 01:57:48 archie Exp $
|
||||
*/
|
||||
|
||||
#include "wdc.h"
|
||||
@ -94,7 +94,6 @@ static void acd_done(struct acd *, struct buf *, int, struct atapires);
|
||||
static int acd_read_toc(struct acd *);
|
||||
static int acd_request_wait(struct acd *, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, char *, int);
|
||||
static void acd_describe(struct acd *);
|
||||
static int acd_open(dev_t, int, int);
|
||||
static int acd_setchan(struct acd *, u_char, u_char, u_char, u_char);
|
||||
static int acd_eject(struct acd *, int);
|
||||
static void acd_select_slot(struct acd *);
|
||||
@ -443,16 +442,12 @@ acdclose(dev_t dev, int flags, int fmt, struct proc *p)
|
||||
static int
|
||||
acdread(dev_t dev, struct uio *uio, int ioflag)
|
||||
{
|
||||
struct acd *cdp = acdtab[dkunit(dev)];
|
||||
|
||||
return physio(acdstrategy, NULL, dev, 1, minphys, uio);
|
||||
}
|
||||
|
||||
static int
|
||||
acdwrite(dev_t dev, struct uio *uio, int ioflag)
|
||||
{
|
||||
struct acd *cdp = acdtab[dkunit(dev)];
|
||||
|
||||
return physio(acdstrategy, NULL, dev, 0, minphys, uio);
|
||||
}
|
||||
|
||||
@ -1289,7 +1284,6 @@ acd_open_track(struct acd *cdp, struct wormio_prepare_track *ptp)
|
||||
{
|
||||
struct write_param param;
|
||||
struct atapires result;
|
||||
int error;
|
||||
|
||||
result = atapi_request_wait(cdp->ata, cdp->unit, ATAPI_MODE_SENSE,
|
||||
0, 0x05, 0, 0, 0, 0,
|
||||
@ -1575,8 +1569,6 @@ static acd_devsw_installed = 0;
|
||||
static void
|
||||
acd_drvinit(void *unused)
|
||||
{
|
||||
dev_t dev;
|
||||
|
||||
if (!acd_devsw_installed) {
|
||||
cdevsw_add_generic(BDEV_MAJOR, CDEV_MAJOR, &acd_cdevsw);
|
||||
acd_devsw_installed = 1;
|
||||
|
||||
@ -170,8 +170,6 @@ static int atapi_io (struct atapi *ata, struct atapicmd *ac);
|
||||
static int atapi_start_cmd (struct atapi *ata, struct atapicmd *ac);
|
||||
static int atapi_wait_cmd (struct atapi *ata, struct atapicmd *ac);
|
||||
|
||||
static void atapi_poll_dsc(struct atapi *ata);
|
||||
|
||||
extern int wdstart (int ctrlr);
|
||||
extern int acdattach(struct atapi*, int, struct atapi_params*, int);
|
||||
extern int wcdattach(struct atapi*, int, struct atapi_params*, int);
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
|
||||
* $Id: fd.c,v 1.124 1998/10/22 05:58:38 bde Exp $
|
||||
* $Id: fd.c,v 1.125 1998/12/04 22:54:46 archie Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -1299,7 +1299,6 @@ fdintr(fdcu_t fdcu)
|
||||
static int
|
||||
fdstate(fdcu_t fdcu, fdc_p fdc)
|
||||
{
|
||||
struct subdev *sd;
|
||||
int read, format, head, i, sec = 0, sectrac, st0, cyl, st3;
|
||||
unsigned blknum = 0, b_cylinder = 0;
|
||||
fdu_t fdu = fdc->fdu;
|
||||
@ -1743,10 +1742,8 @@ static int
|
||||
retrier(fdcu)
|
||||
fdcu_t fdcu;
|
||||
{
|
||||
struct subdev *sd;
|
||||
fdc_p fdc = fdc_data + fdcu;
|
||||
register struct buf *bp;
|
||||
int fdu;
|
||||
|
||||
bp = bufq_first(&fdc->head);
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* $Id: if_cs.c,v 1.5 1998/10/04 02:11:15 msmith Exp $
|
||||
* $Id: if_cs.c,v 1.6 1998/10/22 05:58:38 bde Exp $
|
||||
*
|
||||
* Device driver for Crystal Semiconductor CS8920 based ethernet
|
||||
* adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
|
||||
@ -190,7 +190,6 @@ get_eeprom_cksum(int off, int len, int *buffer)
|
||||
static int
|
||||
wait_eeprom_ready(struct cs_softc *sc)
|
||||
{
|
||||
int timeout=1000;
|
||||
DELAY ( 30000 ); /* XXX should we do some checks here ? */
|
||||
return 0;
|
||||
}
|
||||
@ -233,7 +232,6 @@ cs_duplex_auto(struct cs_softc *sc)
|
||||
static int
|
||||
enable_tp(struct cs_softc *sc)
|
||||
{
|
||||
int i;
|
||||
int unit = sc->arpcom.ac_if.if_unit;
|
||||
|
||||
cs_writereg(sc->nic_addr, PP_LineCTL, sc->line_ctl & ~AUI_ONLY);
|
||||
@ -254,7 +252,6 @@ enable_tp(struct cs_softc *sc)
|
||||
static int
|
||||
send_test_pkt(struct cs_softc *sc)
|
||||
{
|
||||
int unit = sc->arpcom.ac_if.if_unit;
|
||||
char test_packet[] = { 0,0,0,0,0,0, 0,0,0,0,0,0,
|
||||
0, 46, /* A 46 in network order */
|
||||
0, 0, /* DSAP=0 & SSAP=0 fields */
|
||||
@ -343,7 +340,7 @@ cs_cs89x0_probe(struct cs_softc *sc, u_int *dev_irq,
|
||||
int *dev_drq, int iobase, int unit, int flags)
|
||||
{
|
||||
unsigned rev_type = 0;
|
||||
int i, irq=0, result;
|
||||
int i, irq=0;
|
||||
int eeprom_buff[CHKSUM_LEN];
|
||||
int chip_type, pp_isaint, pp_isadma;
|
||||
char chip_revision;
|
||||
@ -646,7 +643,7 @@ cs_init(void *xsc)
|
||||
{
|
||||
struct cs_softc *sc=(struct cs_softc *)xsc;
|
||||
struct ifnet *ifp = &sc->arpcom.ac_if;
|
||||
int i, s, result, rx_cfg;
|
||||
int i, s, rx_cfg;
|
||||
|
||||
/* address not known */
|
||||
if (TAILQ_EMPTY(&ifp->if_addrhead)) /* unlikely? XXX */
|
||||
@ -816,7 +813,7 @@ static void
|
||||
csintr_sc(struct cs_softc *sc, int unit)
|
||||
{
|
||||
struct ifnet *ifp = &(sc->arpcom.ac_if);
|
||||
int status, s;
|
||||
int status;
|
||||
|
||||
#ifdef CS_DEBUG
|
||||
printf(CS_NAME"%1d: Interrupt.\n", unit);
|
||||
@ -1306,7 +1303,6 @@ csintr_pnp_add(struct cs_softc *sc, int unit)
|
||||
static void
|
||||
csintr_pnp(int unit)
|
||||
{
|
||||
struct cs_softc *sc;
|
||||
struct csintr_list *intr;
|
||||
|
||||
for (intr=csintr_head; intr; intr=intr->next) {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
*
|
||||
* Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
|
||||
*
|
||||
* $Id: if_el.c,v 1.37 1998/06/21 15:54:11 bde Exp $
|
||||
* $Id: if_el.c,v 1.38 1998/10/22 05:58:39 bde Exp $
|
||||
*/
|
||||
/* Except of course for the portions of code lifted from other FreeBSD
|
||||
* drivers (mainly elread, elget and el_ioctl)
|
||||
@ -155,8 +155,6 @@ el_attach(struct isa_device *idev)
|
||||
{
|
||||
struct el_softc *sc;
|
||||
struct ifnet *ifp;
|
||||
struct ifaddr *ifa;
|
||||
struct sockaddr_dl *sdl;
|
||||
u_short base;
|
||||
|
||||
dprintf(("Attaching el%d...\n",idev->id_unit));
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* $Id: if_fe.c,v 1.42 1998/06/21 16:51:06 bde Exp $
|
||||
* $Id: if_fe.c,v 1.43 1998/10/22 05:58:39 bde Exp $
|
||||
*
|
||||
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
|
||||
* To be used with FreeBSD 2.x
|
||||
@ -395,7 +395,6 @@ feinit(struct pccard_devinfo *devi)
|
||||
static void
|
||||
feunload(struct pccard_devinfo *devi)
|
||||
{
|
||||
struct fe_softc *sc = &fe_softc[devi->isahd.id_unit];
|
||||
printf("fe%d: unload\n", devi->isahd.id_unit);
|
||||
fe_stop(devi->isahd.id_unit);
|
||||
}
|
||||
@ -1209,7 +1208,7 @@ fe_probe_gwy ( DEVICE * dev, struct fe_softc * sc )
|
||||
static int
|
||||
fe_probe_mbh ( DEVICE * dev, struct fe_softc * sc )
|
||||
{
|
||||
int i,type;
|
||||
int i;
|
||||
|
||||
static struct fe_simple_probe_struct probe_table [] = {
|
||||
{ FE_DLCR0, 0x09, 0x00 },
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: if_wl.c,v 1.16 1998/10/22 05:58:39 bde Exp $ */
|
||||
/* $Id: if_wl.c,v 1.17 1998/11/15 19:30:48 eivind Exp $ */
|
||||
/*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
@ -311,7 +311,6 @@ static void wlmmcstat(int unit);
|
||||
static u_short wlbldru(int unit);
|
||||
static u_short wlmmcread(u_int base, u_short reg);
|
||||
static void wlinitmmc(int unit);
|
||||
static void wlsetirq(int base, int irq);
|
||||
static int wlhwrst(int unit);
|
||||
static void wlrustrt(int unit);
|
||||
static void wlbldcu(int unit);
|
||||
@ -365,7 +364,6 @@ wlprobe(struct isa_device *id)
|
||||
{
|
||||
struct wl_softc *sc = &wl_softc[id->id_unit];
|
||||
register short base = id->id_iobase;
|
||||
int unit = id->id_unit;
|
||||
char *str = "wl%d: board out of range [0..%d]\n";
|
||||
u_char inbuf[100];
|
||||
unsigned long oldpri;
|
||||
@ -723,8 +721,6 @@ static int
|
||||
wlhwrst(int unit)
|
||||
{
|
||||
register struct wl_softc *sc = WLSOFTC(unit);
|
||||
int i;
|
||||
short base = sc->base;
|
||||
|
||||
#ifdef WLDEBUG
|
||||
if (sc->wl_if.if_flags & IFF_DEBUG)
|
||||
@ -1171,7 +1167,6 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
short base = sc->base;
|
||||
short mode = 0;
|
||||
int opri, error = 0;
|
||||
u_short tmp;
|
||||
struct proc *p = curproc; /* XXX */
|
||||
int irq, irqval, i, isroot, size;
|
||||
caddr_t up;
|
||||
@ -1479,11 +1474,8 @@ wlintr(unit)
|
||||
int unit;
|
||||
{
|
||||
register struct wl_softc *sc = &wl_softc[unit];
|
||||
scb_t scb;
|
||||
ac_t cb;
|
||||
short base = sc->base;
|
||||
int next, x, opri;
|
||||
int i, ac_status;
|
||||
int ac_status;
|
||||
u_short int_type, int_type1;
|
||||
|
||||
#ifdef WLDEBUG
|
||||
@ -2328,7 +2320,6 @@ static void
|
||||
wlsftwsleaze(u_short *countp, u_char **mb_pp, struct mbuf **tm_pp, int unit)
|
||||
{
|
||||
struct mbuf *tm_p = *tm_pp;
|
||||
u_char *mb_p = *mb_pp;
|
||||
u_short count = 0;
|
||||
u_char *cp = (u_char *) t_packet;
|
||||
int len;
|
||||
@ -2387,10 +2378,6 @@ wlmmcread(u_int base, u_short reg)
|
||||
static void
|
||||
getsnr(int unit)
|
||||
{
|
||||
register struct wl_softc *sc = WLSOFTC(unit);
|
||||
short base = sc->base;
|
||||
register int s;
|
||||
|
||||
MMC_WRITE(MMC_FREEZE,1);
|
||||
/*
|
||||
* SNR retrieval procedure :
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* $Id: if_ze.c,v 1.54 1998/06/21 17:08:08 bde Exp $
|
||||
* $Id: if_ze.c,v 1.55 1998/10/22 05:58:39 bde Exp $
|
||||
*/
|
||||
|
||||
/* XXX don't mix different PCCARD support code. */
|
||||
@ -726,7 +726,9 @@ ze_watchdog(ifp)
|
||||
#if 1
|
||||
struct ze_softc *sc = (struct ze_softc *)ifp;
|
||||
u_char isr, imr;
|
||||
#ifndef SMP
|
||||
u_int imask;
|
||||
#endif
|
||||
|
||||
if(!(ifp->if_flags & IFF_UP))
|
||||
return;
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: ipl_funcs.c,v 1.12 1998/01/15 07:34:01 gibbs Exp $
|
||||
* $Id: ipl_funcs.c,v 1.13 1998/02/01 22:04:58 bde Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -379,9 +379,10 @@ splx(unsigned ipl)
|
||||
intrmask_t
|
||||
splq(intrmask_t mask)
|
||||
{
|
||||
intrmask_t tmp, tmp2;
|
||||
|
||||
intrmask_t tmp;
|
||||
#ifdef INTR_SPL
|
||||
intrmask_t tmp2;
|
||||
|
||||
for (;;) {
|
||||
IFCPL_LOCK();
|
||||
tmp = tmp2 = cpl;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
|
||||
* ----------------------------------------------------------------------------
|
||||
*
|
||||
* $Id: loran.c,v 1.11 1998/10/24 19:55:09 phk Exp $
|
||||
* $Id: loran.c,v 1.12 1998/12/04 22:54:46 archie Exp $
|
||||
*
|
||||
* This device-driver helps the userland controlprogram for a LORAN-C
|
||||
* receiver avoid monopolizing the CPU.
|
||||
@ -204,8 +204,6 @@ static u_int64_t ticker;
|
||||
|
||||
static u_char par;
|
||||
|
||||
static struct datapoint *this, *next;
|
||||
|
||||
static MALLOC_DEFINE(M_LORAN, "Loran", "Loran datapoints");
|
||||
|
||||
static int loranerror;
|
||||
@ -317,8 +315,6 @@ loranattach(struct isa_device *isdp)
|
||||
static int
|
||||
loranopen (dev_t dev, int flags, int fmt, struct proc *p)
|
||||
{
|
||||
u_long ef;
|
||||
struct datapoint *this;
|
||||
int idx;
|
||||
|
||||
idx = minor(dev);
|
||||
@ -595,7 +591,6 @@ loran_get_timecount(struct timecounter *tc)
|
||||
{
|
||||
unsigned count;
|
||||
u_long ef;
|
||||
u_int high, low;
|
||||
|
||||
ef = read_eflags();
|
||||
disable_intr();
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
|
||||
* $Id: npx.c,v 1.61 1998/06/21 18:02:39 bde Exp $
|
||||
* $Id: npx.c,v 1.62 1998/10/22 05:58:40 bde Exp $
|
||||
*/
|
||||
|
||||
#include "npx.h"
|
||||
@ -146,15 +146,17 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
|
||||
CTLFLAG_RD, &hw_float, 0,
|
||||
"Floatingpoint instructions executed in hardware");
|
||||
|
||||
static u_int npx0_imask = SWI_CLOCK_MASK;
|
||||
#ifndef SMP
|
||||
static u_int npx0_imask = SWI_CLOCK_MASK;
|
||||
static struct gate_descriptor npx_idt_probeintr;
|
||||
static volatile u_int npx_intrs_while_probing;
|
||||
static volatile u_int npx_traps_while_probing;
|
||||
#endif
|
||||
|
||||
static bool_t npx_ex16;
|
||||
static bool_t npx_exists;
|
||||
static struct gate_descriptor npx_idt_probeintr;
|
||||
static int npx_intrno;
|
||||
static volatile u_int npx_intrs_while_probing;
|
||||
static bool_t npx_irq13;
|
||||
static volatile u_int npx_traps_while_probing;
|
||||
|
||||
#ifndef SMP
|
||||
/*
|
||||
@ -249,8 +251,10 @@ static int
|
||||
npxprobe1(dvp)
|
||||
struct isa_device *dvp;
|
||||
{
|
||||
#ifndef SMP
|
||||
u_short control;
|
||||
u_short status;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Partially reset the coprocessor, if any. Some BIOS's don't reset
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: pcf.c,v 1.4 1998/10/31 14:23:09 peter Exp $
|
||||
* $Id: pcf.c,v 1.5 1998/11/04 22:09:17 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
#include <sys/param.h>
|
||||
@ -149,7 +149,6 @@ pcfprobe_isa(struct isa_device *dvp)
|
||||
{
|
||||
device_t pcfdev;
|
||||
struct pcf_isa_softc *pcf;
|
||||
int error;
|
||||
|
||||
if (npcf >= MAXPCF)
|
||||
return (0);
|
||||
@ -172,7 +171,6 @@ pcfprobe_isa(struct isa_device *dvp)
|
||||
if (!pcfdev)
|
||||
goto error;
|
||||
|
||||
end_probe:
|
||||
return (1);
|
||||
|
||||
error:
|
||||
|
||||
@ -239,7 +239,7 @@ update_led(void)
|
||||
|
||||
/* Don't update LED's unless necessary. */
|
||||
|
||||
int opri, new_ledstate, response1, response2;
|
||||
int opri, new_ledstate;
|
||||
|
||||
opri = spltty();
|
||||
new_ledstate = (vsp->scroll_lock) |
|
||||
@ -249,6 +249,7 @@ update_led(void)
|
||||
if (new_ledstate != ledstate)
|
||||
{
|
||||
#ifndef _I386_ISA_KBDIO_H_
|
||||
int response1, response2;
|
||||
|
||||
ledstate = LEDSTATE_UPDATE_PENDING;
|
||||
|
||||
@ -412,7 +413,9 @@ static int
|
||||
set_keyboard_param(int command, int data)
|
||||
{
|
||||
int s;
|
||||
#if 0
|
||||
int c;
|
||||
#endif
|
||||
|
||||
if (kbdc == NULL)
|
||||
return 1;
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: ppc.c,v 1.10 1998/10/22 05:58:40 bde Exp $
|
||||
* $Id: ppc.c,v 1.11 1998/10/31 11:37:09 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
#include "ppc.h"
|
||||
@ -240,7 +240,7 @@ static int
|
||||
ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_mode) /* XXX mode never forced */
|
||||
{
|
||||
static int index = 0;
|
||||
int base, idport, irq;
|
||||
int idport, irq;
|
||||
int ptr, pcr, val, i;
|
||||
|
||||
while ((idport = pc873xx_basetab[index++])) {
|
||||
@ -701,7 +701,7 @@ static int w83877f_hefs[] = { WINB_HEFERE, WINB_HEFRAS, WINB_HEFERE | WINB_HEFRA
|
||||
static int
|
||||
ppc_w83877f_detect(struct ppc_data *ppc, int chipset_mode)
|
||||
{
|
||||
int i, j, efer, base;
|
||||
int i, j, efer;
|
||||
unsigned char r, hefere, hefras;
|
||||
|
||||
for (i = 0; i < 4; i ++) {
|
||||
@ -876,8 +876,6 @@ ppc_w83877f_detect(struct ppc_data *ppc, int chipset_mode)
|
||||
static int
|
||||
ppc_generic_detect(struct ppc_data *ppc, int chipset_mode)
|
||||
{
|
||||
char save_control;
|
||||
|
||||
/* default to generic */
|
||||
ppc->ppc_link.adapter = &ppc_generic_adapter;
|
||||
|
||||
@ -1308,7 +1306,6 @@ ppcprobe(struct isa_device *dvp)
|
||||
{
|
||||
static short next_bios_ppc = 0;
|
||||
struct ppc_data *ppc;
|
||||
int error;
|
||||
|
||||
/*
|
||||
* If port not specified, use bios list.
|
||||
@ -1370,8 +1367,6 @@ ppcprobe(struct isa_device *dvp)
|
||||
if (ppc_detect(ppc, dvp->id_flags & 0xf))
|
||||
goto error;
|
||||
|
||||
end_probe:
|
||||
|
||||
return (1);
|
||||
|
||||
error:
|
||||
@ -1383,7 +1378,6 @@ ppcattach(struct isa_device *isdp)
|
||||
{
|
||||
struct ppc_data *ppc = ppcdata[isdp->id_unit];
|
||||
struct ppb_data *ppbus;
|
||||
char * mode;
|
||||
|
||||
printf("ppc%d: %s chipset (%s) in %s mode%s\n", ppc->ppc_unit,
|
||||
ppc_types[ppc->ppc_type], ppc_avms[ppc->ppc_avm],
|
||||
|
||||
@ -809,10 +809,11 @@ static struct cdevsw rp_cdevsw = {
|
||||
|
||||
static int rp_controller_port = 0;
|
||||
static int rp_num_ports_open = 0;
|
||||
static int rp_timeout;
|
||||
static int ndevs = 0;
|
||||
static int minor_to_unit[128];
|
||||
#if 0
|
||||
static struct tty rp_tty[128];
|
||||
#endif
|
||||
|
||||
static int rp_num_ports[4]; /* Number of ports on each controller */
|
||||
|
||||
@ -858,7 +859,7 @@ static _INLINE_ void rp_do_receive(struct rp_port *rp, struct tty *tp,
|
||||
{
|
||||
int spl;
|
||||
unsigned int CharNStat;
|
||||
int ToRecv, wRecv, ch;
|
||||
int ToRecv, ch;
|
||||
|
||||
ToRecv = sGetRxCnt(cp);
|
||||
if(ToRecv == 0)
|
||||
@ -924,7 +925,7 @@ static _INLINE_ void rp_handle_port(struct rp_port *rp)
|
||||
CHANNEL_t *cp;
|
||||
struct tty *tp;
|
||||
unsigned int IntMask, ChanStatus;
|
||||
int oldcts, ToRecv;
|
||||
/* int oldcts; */
|
||||
|
||||
if(!rp)
|
||||
return;
|
||||
@ -1023,9 +1024,8 @@ int
|
||||
rpprobe(dev)
|
||||
struct isa_device *dev;
|
||||
{
|
||||
struct isa_device *idev;
|
||||
int controller, unit;
|
||||
int i, aiop, num_aiops;
|
||||
int aiop, num_aiops;
|
||||
unsigned int aiopio[MAX_AIOPS_PER_BOARD];
|
||||
CONTROLLER_t *ctlp;
|
||||
|
||||
@ -1070,7 +1070,7 @@ static void
|
||||
rp_pciattach(pcici_t tag, int unit)
|
||||
{
|
||||
dev_t rp_dev;
|
||||
int success, rpmajor, oldspl;
|
||||
int success, oldspl;
|
||||
u_short iobase;
|
||||
int num_ports, num_chan, num_aiops;
|
||||
int aiop, chan, port;
|
||||
@ -1079,7 +1079,6 @@ rp_pciattach(pcici_t tag, int unit)
|
||||
struct rp_port *rp;
|
||||
struct tty *tty;
|
||||
CONTROLLER_t *ctlp;
|
||||
char status;
|
||||
|
||||
success = pci_map_port(tag, 0x10, &iobase);
|
||||
if(!success)
|
||||
@ -1183,7 +1182,7 @@ struct isa_device *dev;
|
||||
{
|
||||
struct isa_device *idev;
|
||||
dev_t rp_dev;
|
||||
int iobase, unit, rpmajor, oldspl;
|
||||
int iobase, unit, /*rpmajor,*/ oldspl;
|
||||
int num_ports, num_chan, num_aiops;
|
||||
int aiop, chan, port;
|
||||
int ChanStatus, line, i, count;
|
||||
@ -1191,7 +1190,6 @@ struct isa_device *dev;
|
||||
struct rp_port *rp;
|
||||
struct tty *tty;
|
||||
CONTROLLER_t *ctlp;
|
||||
char status;
|
||||
|
||||
iobase = dev->id_iobase;
|
||||
unit = dev->id_unit;
|
||||
@ -1303,7 +1301,7 @@ rpopen(dev, flag, mode, p)
|
||||
struct proc *p;
|
||||
{
|
||||
struct rp_port *rp;
|
||||
int unit, i, port, mynor, umynor, flags; /* SG */
|
||||
int unit, port, mynor, umynor, flags; /* SG */
|
||||
struct tty *tp;
|
||||
int oldspl, error;
|
||||
unsigned int IntMask, ChanStatus;
|
||||
@ -1450,7 +1448,7 @@ rpclose(dev, flag, mode, p)
|
||||
int flag, mode;
|
||||
struct proc *p;
|
||||
{
|
||||
int oldspl, unit, mynor, umynor, port, status, i; /* SG */
|
||||
int oldspl, unit, mynor, umynor, port; /* SG */
|
||||
struct rp_port *rp;
|
||||
struct tty *tp;
|
||||
CHANNEL_t *cp;
|
||||
@ -1483,7 +1481,7 @@ rpclose(dev, flag, mode, p)
|
||||
static void
|
||||
rphardclose(struct rp_port *rp)
|
||||
{
|
||||
int status, oldspl, mynor;
|
||||
int mynor;
|
||||
struct tty *tp;
|
||||
CHANNEL_t *cp;
|
||||
|
||||
@ -1525,7 +1523,7 @@ rpread(dev, uio, flag)
|
||||
{
|
||||
struct rp_port *rp;
|
||||
struct tty *tp;
|
||||
int unit, i, mynor, umynor, port, error = 0; /* SG */
|
||||
int unit, mynor, umynor, port, error = 0; /* SG */
|
||||
|
||||
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
|
||||
port = (minor(dev) & 0x1f); /* SG */
|
||||
@ -1549,7 +1547,7 @@ rpwrite(dev, uio, flag)
|
||||
{
|
||||
struct rp_port *rp;
|
||||
struct tty *tp;
|
||||
int unit, i, mynor, port, umynor, error = 0; /* SG */
|
||||
int unit, mynor, port, umynor, error = 0; /* SG */
|
||||
|
||||
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
|
||||
port = (minor(dev) & 0x1f); /* SG */
|
||||
@ -1594,9 +1592,8 @@ rpioctl(dev, cmd, data, flag, p)
|
||||
CHANNEL_t *cp;
|
||||
struct tty *tp;
|
||||
int unit, mynor, port, umynor; /* SG */
|
||||
int oldspl, cflag, iflag, oflag, lflag;
|
||||
int i, error = 0;
|
||||
char status;
|
||||
int oldspl;
|
||||
int error = 0;
|
||||
int arg, flags, result, ChanStatus;
|
||||
int oldcmd;
|
||||
struct termios term, *t;
|
||||
@ -1804,9 +1801,9 @@ rpparam(tp, t)
|
||||
{
|
||||
struct rp_port *rp;
|
||||
CHANNEL_t *cp;
|
||||
int unit, i, mynor, port, umynor; /* SG */
|
||||
int unit, mynor, port, umynor; /* SG */
|
||||
int oldspl, cflag, iflag, oflag, lflag;
|
||||
int ospeed, flags;
|
||||
int ospeed;
|
||||
|
||||
|
||||
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
|
||||
@ -1942,10 +1939,10 @@ rpstart(tp)
|
||||
struct rp_port *rp;
|
||||
CHANNEL_t *cp;
|
||||
struct clist *qp;
|
||||
int unit, i, mynor, port, umynor; /* SG */
|
||||
char status, ch, flags;
|
||||
int unit, mynor, port, umynor; /* SG */
|
||||
char ch, flags;
|
||||
int spl, xmit_fifo_room;
|
||||
int count, ToRecv;
|
||||
int count;
|
||||
|
||||
|
||||
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
|
||||
@ -2002,11 +1999,8 @@ rpstop(tp, flag)
|
||||
{
|
||||
struct rp_port *rp;
|
||||
CHANNEL_t *cp;
|
||||
struct clist *qp;
|
||||
int unit, mynor, port, umynor; /* SG */
|
||||
char status, ch;
|
||||
int spl, xmit_fifo_room;
|
||||
int i, count;
|
||||
int spl;
|
||||
|
||||
umynor = (((minor(tp->t_dev) >> 16) -1) * 32); /* SG */
|
||||
port = (minor(tp->t_dev) & 0x1f); /* SG */
|
||||
@ -2044,7 +2038,7 @@ struct tty *
|
||||
rpdevtotty(dev_t dev)
|
||||
{
|
||||
struct rp_port *rp;
|
||||
int unit, i, port, mynor, umynor; /* SG */
|
||||
int unit, port, mynor, umynor; /* SG */
|
||||
|
||||
umynor = (((minor(dev) >> 16) -1) * 32); /* SG */
|
||||
port = (minor(dev) & 0x1f); /* SG */
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: scvesactl.c,v 1.5 1998/09/26 03:38:40 yokota Exp $
|
||||
* $Id: scvesactl.c,v 1.6 1998/10/01 11:39:17 yokota Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
@ -52,11 +52,8 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
|
||||
{
|
||||
scr_stat *scp;
|
||||
struct tty *tp;
|
||||
video_info_t info;
|
||||
video_adapter_t *adp;
|
||||
int mode;
|
||||
int error;
|
||||
int s;
|
||||
|
||||
tp = scdevtotty(dev);
|
||||
if (!tp)
|
||||
@ -84,7 +81,6 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
|
||||
if (!(adp->va_flags & V_ADP_MODECHANGE))
|
||||
return ENODEV;
|
||||
mode = (cmd & 0xff) + M_VESA_BASE;
|
||||
vesa_text:
|
||||
return sc_set_text_mode(scp, tp, mode, 0, 0, 0);
|
||||
|
||||
/* graphics modes */
|
||||
@ -112,7 +108,6 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
|
||||
if (!(adp->va_flags & V_ADP_MODECHANGE))
|
||||
return ENODEV;
|
||||
mode = (cmd & 0xff) + M_VESA_BASE;
|
||||
vesa_graphics:
|
||||
return sc_set_graphics_mode(scp, tp, mode);
|
||||
}
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
|
||||
* $Id: sio.c,v 1.217 1998/11/22 09:41:12 bde Exp $
|
||||
* $Id: sio.c,v 1.218 1998/11/22 10:47:42 bde Exp $
|
||||
*/
|
||||
|
||||
#include "opt_comconsole.h"
|
||||
@ -1521,7 +1521,6 @@ siointr1(com)
|
||||
u_char modem_status;
|
||||
u_char *ioptr;
|
||||
u_char recv_data;
|
||||
u_char int_ident;
|
||||
u_char int_ctl;
|
||||
u_char int_ctl_new;
|
||||
|
||||
|
||||
@ -914,7 +914,6 @@ ad1848_start_input(int dev, u_long buf, int count,
|
||||
static int
|
||||
ad1848_prepare_for_IO(int dev, int bsize, int bcount)
|
||||
{
|
||||
int timeout;
|
||||
u_char fs, old_fs;
|
||||
u_long flags;
|
||||
ad1848_info *devc = (ad1848_info *) audio_devs[dev]->devc;
|
||||
|
||||
@ -331,7 +331,6 @@ static int
|
||||
dma_sync(int dev)
|
||||
{
|
||||
u_long flags;
|
||||
int i = 0;
|
||||
|
||||
if (!audio_devs[dev]->go && (!audio_devs[dev]->enable_bits & PCM_ENABLE_OUTPUT))
|
||||
return 0;
|
||||
@ -1155,8 +1154,6 @@ DMAbuf_outputintr(int dev, int event_type)
|
||||
if (dmap->mapping_flags & DMA_MAP_MAPPED) {
|
||||
/* mmapped access */
|
||||
|
||||
int p = dmap->fragment_size * dmap->qhead;
|
||||
|
||||
dmap->qhead = (dmap->qhead + 1) % dmap->nbufs;
|
||||
dmap->qlen++; /* Yes increment it (don't decrement) */
|
||||
dmap->flags &= ~DMA_ACTIVE;
|
||||
|
||||
@ -181,7 +181,7 @@ pmgr_access(int dev, struct patmgr_info * rec)
|
||||
if (mbox[dev])
|
||||
printf(" PATMGR: Server %d mbox full. Why?\n", dev);
|
||||
else {
|
||||
int flag, chn;
|
||||
int chn;
|
||||
|
||||
rec->key = PM_K_COMMAND;
|
||||
mbox[dev] = rec;
|
||||
@ -235,7 +235,7 @@ pmgr_inform(int dev, int event, u_long p1, u_long p2, u_long p3, u_long p4)
|
||||
if (mbox[dev])
|
||||
printf(" PATMGR: Server %d mbox full. Why?\n", dev);
|
||||
else {
|
||||
int flag, chn;
|
||||
int chn;
|
||||
|
||||
mbox[dev] = tmp_mbox;
|
||||
mbox[dev]->key = PM_K_EVENT;
|
||||
|
||||
@ -197,8 +197,6 @@ sb16_dsp_ioctl(int dev, u_int cmd, ioctl_arg arg, int local)
|
||||
static int
|
||||
sb16_dsp_open(int dev, int mode)
|
||||
{
|
||||
int retval;
|
||||
|
||||
DEB(printf("sb16_dsp_open()\n"));
|
||||
|
||||
if (!sb16_dsp_ok) {
|
||||
|
||||
@ -539,8 +539,6 @@ sb_dsp_halt_xfer(int dev)
|
||||
static int
|
||||
sb_dsp_open(int dev, int mode)
|
||||
{
|
||||
int retval;
|
||||
|
||||
if (!sb_dsp_ok) {
|
||||
printf("SB Error: SoundBlaster board not installed\n");
|
||||
return -(ENXIO);
|
||||
|
||||
@ -157,7 +157,7 @@ sequencer_read(int dev, struct fileinfo * file, snd_rw_buf * buf, int count)
|
||||
|
||||
flags = splhigh();
|
||||
if (!iqlen) {
|
||||
int flag, chn;
|
||||
int chn;
|
||||
|
||||
|
||||
midi_sleeper = &chn;
|
||||
|
||||
@ -147,7 +147,6 @@ get_time(void)
|
||||
static int
|
||||
sndmmap( dev_t dev, int offset, int nprot )
|
||||
{
|
||||
int unit;
|
||||
struct dma_buffparms * dmap;
|
||||
|
||||
dev = minor(dev) >> 4;
|
||||
|
||||
@ -292,7 +292,6 @@ void
|
||||
sscapeintr(int irq)
|
||||
{
|
||||
u_char bits, tmp;
|
||||
static int debug = 0;
|
||||
|
||||
DEB(printf("sscapeintr(0x%02x)\n", (bits = sscape_read(devc, GA_INTSTAT_REG))));
|
||||
if ((sscape_sleep_flag.mode & WK_SLEEP)) {
|
||||
@ -304,6 +303,8 @@ sscapeintr(int irq)
|
||||
}
|
||||
#if (defined(CONFIG_MPU401) || defined(CONFIG_MPU_EMU)) && defined(CONFIG_MIDI)
|
||||
if (bits & 0x01) {
|
||||
static int debug = 0;
|
||||
|
||||
mpuintr(irq);
|
||||
if (debug++ > 10) { /* Temporary debugging hack */
|
||||
sscape_write(devc, GA_INTENA_REG, 0x00); /* Disable all interr. */
|
||||
@ -454,7 +455,6 @@ sscape_download_boot(struct sscape_info * devc, u_char *block, int size, int fla
|
||||
done = 0;
|
||||
timeout_val = 100;
|
||||
while (!done && timeout_val-- > 0) {
|
||||
int resid;
|
||||
int chn;
|
||||
sscape_sleeper = &chn;
|
||||
DO_SLEEP(chn, sscape_sleep_flag, 1);
|
||||
@ -733,6 +733,8 @@ sscape_audio_reset(int dev)
|
||||
sscape_audio_halt(dev);
|
||||
}
|
||||
|
||||
|
||||
#if !defined(EXCLUDE_NATIVE_PCM) && defined(CONFIG_AUDIO)
|
||||
static struct audio_operations sscape_audio_operations =
|
||||
{
|
||||
"Not functional",
|
||||
@ -751,14 +753,13 @@ static struct audio_operations sscape_audio_operations =
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
#endif /* !defined(EXCLUDE_NATIVE_PCM) && defined(CONFIG_AUDIO) */
|
||||
|
||||
static int sscape_detected = 0;
|
||||
|
||||
void
|
||||
attach_sscape(struct address_info * hw_config)
|
||||
{
|
||||
int my_dev;
|
||||
|
||||
#ifndef SSCAPE_REGS
|
||||
/*
|
||||
* Config register values for Spea/V7 Media FX and Ensoniq S-2000.
|
||||
@ -877,6 +878,8 @@ attach_sscape(struct address_info * hw_config)
|
||||
|
||||
#ifdef CONFIG_AUDIO
|
||||
if (num_audiodevs < MAX_AUDIO_DEV) {
|
||||
int my_dev;
|
||||
|
||||
audio_devs[my_dev = num_audiodevs++] = &sscape_audio_operations;
|
||||
audio_devs[my_dev]->dmachan1 = hw_config->dma;
|
||||
audio_devs[my_dev]->buffsize = DSP_BUFFSIZE;
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: syscons.c,v 1.286 1998/11/03 02:37:46 yokota Exp $
|
||||
* $Id: syscons.c,v 1.287 1998/11/08 12:39:02 dfr Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
@ -640,7 +640,9 @@ static int
|
||||
scattach(struct isa_device *dev)
|
||||
{
|
||||
scr_stat *scp;
|
||||
#if defined(VESA) && defined(VM86)
|
||||
video_info_t info;
|
||||
#endif
|
||||
dev_t cdev = makedev(CDEV_MAJOR, 0);
|
||||
#ifdef DEVFS
|
||||
int vc;
|
||||
@ -924,7 +926,6 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
|
||||
int i;
|
||||
struct tty *tp;
|
||||
scr_stat *scp;
|
||||
video_adapter_t *adp;
|
||||
int s;
|
||||
|
||||
tp = scdevtotty(dev);
|
||||
|
||||
@ -416,7 +416,6 @@ int twopen(dev, flag, mode, p)
|
||||
{
|
||||
struct tw_sc *sc = &tw_sc[TWUNIT(dev)];
|
||||
int s;
|
||||
int port;
|
||||
|
||||
s = spltty();
|
||||
if(sc->sc_state == 0) {
|
||||
@ -437,7 +436,6 @@ int twclose(dev, flag, mode, p)
|
||||
{
|
||||
struct tw_sc *sc = &tw_sc[TWUNIT(dev)];
|
||||
int s;
|
||||
int port = sc->sc_port;
|
||||
|
||||
s = spltty();
|
||||
sc->sc_state = 0;
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: vesa.c,v 1.7 1998/10/01 11:39:18 yokota Exp $
|
||||
* $Id: vesa.c,v 1.8 1998/10/02 03:42:19 yokota Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
@ -349,7 +349,6 @@ vesa_bios_init(void)
|
||||
static u_char buf[512];
|
||||
struct vm86frame vmf;
|
||||
struct vesa_mode vmode;
|
||||
u_int32_t p;
|
||||
int modes;
|
||||
int err;
|
||||
int i;
|
||||
@ -758,7 +757,6 @@ static int
|
||||
vesa_diag(int level)
|
||||
{
|
||||
struct vesa_mode vmode;
|
||||
u_int32_t p;
|
||||
int i;
|
||||
|
||||
#ifndef VESA_MODULE
|
||||
@ -843,7 +841,9 @@ vesa_load(void)
|
||||
{
|
||||
int adapters;
|
||||
int error;
|
||||
#ifdef VESA_MODULE
|
||||
int s;
|
||||
#endif
|
||||
int i;
|
||||
|
||||
if (vesa_init_done)
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: videoio.c,v 1.5 1998/09/26 03:38:40 yokota Exp $
|
||||
* $Id: videoio.c,v 1.6 1998/10/01 11:39:18 yokota Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
@ -1156,10 +1156,12 @@ static int
|
||||
vid_save_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
|
||||
{
|
||||
u_char buf[PARAM_BUFSIZE];
|
||||
u_char val = 0;
|
||||
u_int32_t segment;
|
||||
int c;
|
||||
#ifdef SC_ALT_SEQACCESS
|
||||
u_char val = 0;
|
||||
int s;
|
||||
#endif
|
||||
|
||||
prologue(ad, V_ADP_FONT, 1);
|
||||
|
||||
@ -1231,10 +1233,12 @@ static int
|
||||
vid_load_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
|
||||
{
|
||||
u_char buf[PARAM_BUFSIZE];
|
||||
u_char val = 0;
|
||||
u_int32_t segment;
|
||||
int c;
|
||||
#ifdef SC_ALT_SEQACCESS
|
||||
u_char val = 0;
|
||||
int s;
|
||||
#endif
|
||||
|
||||
prologue(ad, V_ADP_FONT, 1);
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: atapi-cd.c,v 1.4 1998/10/30 10:57:09 luigi Exp $
|
||||
* $Id: atapi-cd.c,v 1.5 1998/11/21 01:57:48 archie Exp $
|
||||
*/
|
||||
|
||||
#include "wdc.h"
|
||||
@ -94,7 +94,6 @@ static void acd_done(struct acd *, struct buf *, int, struct atapires);
|
||||
static int acd_read_toc(struct acd *);
|
||||
static int acd_request_wait(struct acd *, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, char *, int);
|
||||
static void acd_describe(struct acd *);
|
||||
static int acd_open(dev_t, int, int);
|
||||
static int acd_setchan(struct acd *, u_char, u_char, u_char, u_char);
|
||||
static int acd_eject(struct acd *, int);
|
||||
static void acd_select_slot(struct acd *);
|
||||
@ -443,16 +442,12 @@ acdclose(dev_t dev, int flags, int fmt, struct proc *p)
|
||||
static int
|
||||
acdread(dev_t dev, struct uio *uio, int ioflag)
|
||||
{
|
||||
struct acd *cdp = acdtab[dkunit(dev)];
|
||||
|
||||
return physio(acdstrategy, NULL, dev, 1, minphys, uio);
|
||||
}
|
||||
|
||||
static int
|
||||
acdwrite(dev_t dev, struct uio *uio, int ioflag)
|
||||
{
|
||||
struct acd *cdp = acdtab[dkunit(dev)];
|
||||
|
||||
return physio(acdstrategy, NULL, dev, 0, minphys, uio);
|
||||
}
|
||||
|
||||
@ -1289,7 +1284,6 @@ acd_open_track(struct acd *cdp, struct wormio_prepare_track *ptp)
|
||||
{
|
||||
struct write_param param;
|
||||
struct atapires result;
|
||||
int error;
|
||||
|
||||
result = atapi_request_wait(cdp->ata, cdp->unit, ATAPI_MODE_SENSE,
|
||||
0, 0x05, 0, 0, 0, 0,
|
||||
@ -1575,8 +1569,6 @@ static acd_devsw_installed = 0;
|
||||
static void
|
||||
acd_drvinit(void *unused)
|
||||
{
|
||||
dev_t dev;
|
||||
|
||||
if (!acd_devsw_installed) {
|
||||
cdevsw_add_generic(BDEV_MAJOR, CDEV_MAJOR, &acd_cdevsw);
|
||||
acd_devsw_installed = 1;
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: wfd.c,v 1.15 1998/08/23 20:16:34 phk Exp $
|
||||
* $Id: wfd.c,v 1.16 1998/09/15 08:15:30 gibbs Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -661,9 +661,6 @@ int wfdioctl (dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
|
||||
struct wfd *t = wfdtab[lun];
|
||||
int error = 0;
|
||||
|
||||
struct disklabel *dl;
|
||||
char buffer[DEV_BSIZE];
|
||||
|
||||
error = dsioctl("wfd", dev, cmd, addr, flag, &t->dk_slices,
|
||||
wfdstrategy1, (ds_setgeom_t *)NULL);
|
||||
if (error != -1)
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: wst.c,v 1.12 1998/09/15 18:16:38 sos Exp $
|
||||
*/
|
||||
|
||||
#include "wdc.h"
|
||||
@ -199,7 +199,6 @@ static
|
||||
int wstattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug);
|
||||
static int wst_sense(struct wst *t);
|
||||
static void wst_describe(struct wst *t);
|
||||
static int wst_open(dev_t dev, int chardev);
|
||||
static void wst_poll_dsc(struct wst *t);
|
||||
static void wst_start(struct wst *t);
|
||||
static void wst_done(struct wst *t, struct buf *bp, int resid, struct atapires result);
|
||||
@ -230,9 +229,7 @@ int
|
||||
wstattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
|
||||
{
|
||||
struct wst *t;
|
||||
struct atapires result;
|
||||
int lun, i;
|
||||
char buffer[255];
|
||||
int lun;
|
||||
|
||||
if (wstnlun >= NUNIT) {
|
||||
printf("wst: too many units\n");
|
||||
@ -348,9 +345,7 @@ int
|
||||
wstopen(dev_t dev, int flags, int fmt, struct proc *p)
|
||||
{
|
||||
int lun = UNIT(dev);
|
||||
char buffer[255];
|
||||
struct wst *t;
|
||||
struct atapires result;
|
||||
|
||||
/* Check that the device number and that the ATAPI driver is loaded. */
|
||||
if (lun >= wstnlun || !atapi_request_immediate) {
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
|
||||
* $Id: fd.c,v 1.124 1998/10/22 05:58:38 bde Exp $
|
||||
* $Id: fd.c,v 1.125 1998/12/04 22:54:46 archie Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -1299,7 +1299,6 @@ fdintr(fdcu_t fdcu)
|
||||
static int
|
||||
fdstate(fdcu_t fdcu, fdc_p fdc)
|
||||
{
|
||||
struct subdev *sd;
|
||||
int read, format, head, i, sec = 0, sectrac, st0, cyl, st3;
|
||||
unsigned blknum = 0, b_cylinder = 0;
|
||||
fdu_t fdu = fdc->fdu;
|
||||
@ -1743,10 +1742,8 @@ static int
|
||||
retrier(fdcu)
|
||||
fdcu_t fdcu;
|
||||
{
|
||||
struct subdev *sd;
|
||||
fdc_p fdc = fdc_data + fdcu;
|
||||
register struct buf *bp;
|
||||
int fdu;
|
||||
|
||||
bp = bufq_first(&fdc->head);
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: ppc.c,v 1.10 1998/10/22 05:58:40 bde Exp $
|
||||
* $Id: ppc.c,v 1.11 1998/10/31 11:37:09 nsouch Exp $
|
||||
*
|
||||
*/
|
||||
#include "ppc.h"
|
||||
@ -240,7 +240,7 @@ static int
|
||||
ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_mode) /* XXX mode never forced */
|
||||
{
|
||||
static int index = 0;
|
||||
int base, idport, irq;
|
||||
int idport, irq;
|
||||
int ptr, pcr, val, i;
|
||||
|
||||
while ((idport = pc873xx_basetab[index++])) {
|
||||
@ -701,7 +701,7 @@ static int w83877f_hefs[] = { WINB_HEFERE, WINB_HEFRAS, WINB_HEFERE | WINB_HEFRA
|
||||
static int
|
||||
ppc_w83877f_detect(struct ppc_data *ppc, int chipset_mode)
|
||||
{
|
||||
int i, j, efer, base;
|
||||
int i, j, efer;
|
||||
unsigned char r, hefere, hefras;
|
||||
|
||||
for (i = 0; i < 4; i ++) {
|
||||
@ -876,8 +876,6 @@ ppc_w83877f_detect(struct ppc_data *ppc, int chipset_mode)
|
||||
static int
|
||||
ppc_generic_detect(struct ppc_data *ppc, int chipset_mode)
|
||||
{
|
||||
char save_control;
|
||||
|
||||
/* default to generic */
|
||||
ppc->ppc_link.adapter = &ppc_generic_adapter;
|
||||
|
||||
@ -1308,7 +1306,6 @@ ppcprobe(struct isa_device *dvp)
|
||||
{
|
||||
static short next_bios_ppc = 0;
|
||||
struct ppc_data *ppc;
|
||||
int error;
|
||||
|
||||
/*
|
||||
* If port not specified, use bios list.
|
||||
@ -1370,8 +1367,6 @@ ppcprobe(struct isa_device *dvp)
|
||||
if (ppc_detect(ppc, dvp->id_flags & 0xf))
|
||||
goto error;
|
||||
|
||||
end_probe:
|
||||
|
||||
return (1);
|
||||
|
||||
error:
|
||||
@ -1383,7 +1378,6 @@ ppcattach(struct isa_device *isdp)
|
||||
{
|
||||
struct ppc_data *ppc = ppcdata[isdp->id_unit];
|
||||
struct ppb_data *ppbus;
|
||||
char * mode;
|
||||
|
||||
printf("ppc%d: %s chipset (%s) in %s mode%s\n", ppc->ppc_unit,
|
||||
ppc_types[ppc->ppc_type], ppc_avms[ppc->ppc_avm],
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)subr_log.c 8.1 (Berkeley) 6/10/93
|
||||
* $Id: subr_log.c,v 1.31 1998/11/11 10:03:55 truckman Exp $
|
||||
* $Id: subr_log.c,v 1.32 1998/11/11 10:55:56 truckman Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -180,8 +180,6 @@ logpoll(dev, events, p)
|
||||
void
|
||||
logwakeup()
|
||||
{
|
||||
struct proc *p;
|
||||
|
||||
if (!log_open)
|
||||
return;
|
||||
selwakeup(&logsoftc.sc_selp);
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: subr_rman.c,v 1.1 1998/10/29 01:48:36 wollman Exp $
|
||||
* $Id: subr_rman.c,v 1.2 1998/11/23 09:33:35 bde Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -79,7 +79,6 @@ int
|
||||
rman_init(struct rman *rm)
|
||||
{
|
||||
static int once;
|
||||
struct resource *r;
|
||||
|
||||
if (once == 0) {
|
||||
once = 1;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user