closer to building with -Wno-uninitialized

20 files changed, 38 insertions, 91 deletions

diff --git a/sys/arch/powerpc/mac/awacs.c b/sys/arch/powerpc/mac/awacs.c
index dad8e73a6c3..75124a97778 100644
--- a/sys/arch/powerpc/mac/awacs.c
+++ b/sys/arch/powerpc/mac/awacs.c
@@ -376,7 +376,6 @@ awacs_intr(v)
 {
 	int reason;
 	struct awacs_softc *sc = v;
-	int error;
 	reason = awacs_read_reg(sc, AWACS_SOUND_CTRL);
 
 	if (reason & AWACS_CTL_CNTRLERR) {
diff --git a/sys/arch/powerpc/mac/dbdma.c b/sys/arch/powerpc/mac/dbdma.c
index 23b07b0dcdd..db6e7788614 100644
--- a/sys/arch/powerpc/mac/dbdma.c
+++ b/sys/arch/powerpc/mac/dbdma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dbdma.c,v 1.2 2000/05/02 03:04:27 rahnds Exp $	*/
+/*	$OpenBSD: dbdma.c,v 1.3 2001/06/25 23:29:54 drahn Exp $	*/
 /*	$NetBSD: dbdma.c,v 1.2 1998/08/21 16:13:28 tsubai Exp $	*/
 
 /*
@@ -34,7 +34,6 @@
 
 
 
-static int	dbdma_alloc_index = 0;
 dbdma_command_t	*dbdma_alloc_commands = NULL;
 
 void
diff --git a/sys/arch/powerpc/mac/gpio.c b/sys/arch/powerpc/mac/gpio.c
index 0e568f1570b..6e72a4f0c61 100644
--- a/sys/arch/powerpc/mac/gpio.c
+++ b/sys/arch/powerpc/mac/gpio.c
@@ -172,7 +172,6 @@ extern struct cfdriver adb_cd;
 int
 gpio_intr(void *arg)
 {
-	struct gpio_softc *sc = arg;
 	int rv = 0;
 
 #if NADB > 0
diff --git a/sys/arch/powerpc/mac/if_bm.c b/sys/arch/powerpc/mac/if_bm.c
index 1ddb8e54161..e7b17fc8eef 100644
--- a/sys/arch/powerpc/mac/if_bm.c
+++ b/sys/arch/powerpc/mac/if_bm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bm.c,v 1.6 2001/02/20 19:39:33 mickey Exp $	*/
+/*	$OpenBSD: if_bm.c,v 1.7 2001/06/25 23:29:55 drahn Exp $	*/
 /*	$NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $	*/
 
 /*-
@@ -104,7 +104,9 @@ static void bmac_reset_chip __P((struct bmac_softc *));
 static void bmac_init __P((struct bmac_softc *));
 static void bmac_init_dma __P((struct bmac_softc *));
 static int bmac_intr __P((void *));
+#ifdef WHY_IS_THIS_XXXX
 static int bmac_tx_intr __P((void *));
+#endif /* WHY_IS_THIS_XXXX */
 static int bmac_rint __P((void *));
 static void bmac_reset __P((struct bmac_softc *));
 static void bmac_stop __P((struct bmac_softc *));
@@ -188,7 +190,6 @@ bmac_attach(parent, self, aux)
 	struct bmac_softc *sc = (void *)self;
 	struct ifnet *ifp = &sc->sc_if;
 	u_char laddr[6];
-	int i;
 
 	sc->sc_flags =0;
 	if (strcmp(ca->ca_name, "ethernet") == 0) {
@@ -227,10 +228,10 @@ bmac_attach(parent, self, aux)
 
 	mac_intr_establish(parent, ca->ca_intr[0], IST_LEVEL, IPL_NET,
 		bmac_intr, sc, "bmac intr");
-	/*
+#ifdef WHY_IS_THIS_XXXX
 	mac_intr_establish(parent, ca->ca_intr[1], IST_LEVEL, IPL_NET,
 		bmac_tx_intr, sc, "bmac_tx");
-	*/
+#endif /* WHY_IS_THIS_XXXX */
 	mac_intr_establish(parent, ca->ca_intr[2], IST_LEVEL, IPL_NET,
 		bmac_rint, sc, "bmac rint");
 
@@ -297,7 +298,7 @@ bmac_init(sc)
 	struct ifnet *ifp = &sc->sc_if;
 	struct ether_header *eh;
 	caddr_t data;
-	int i, tb;
+	int tb;
 	u_short *p;
 
 	bmac_init_mif(sc);
@@ -413,12 +414,12 @@ bmac_init_dma(sc)
 	dbdma_start(sc->sc_rxdma, sc->sc_rxcmd);
 }
 
+#ifdef WHY_IS_THIS_XXXX
 int
 bmac_tx_intr(v)
 	void *v;
 {
 	struct bmac_softc *sc = v;
-	u_int16_t stat;
 
 	sc->sc_if.if_flags &= ~IFF_OACTIVE;
 	sc->sc_if.if_timer = 0;
@@ -445,6 +446,7 @@ bmac_tx_intr(v)
 	#endif
 	return 1;
 }
+#endif /* WHY_IS_THIS_XXXX */
 int
 bmac_intr(v)
 	void *v;
@@ -751,7 +753,6 @@ bmac_ioctl(ifp, cmd, data)
 	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
-	int temp;
 
 	s = splnet();
 
diff --git a/sys/arch/powerpc/mac/if_gm.c b/sys/arch/powerpc/mac/if_gm.c
index 07272deaed7..62d274ad16f 100644
--- a/sys/arch/powerpc/mac/if_gm.c
+++ b/sys/arch/powerpc/mac/if_gm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gm.c,v 1.13 2001/06/24 20:26:13 drahn Exp $	*/
+/*	$OpenBSD: if_gm.c,v 1.14 2001/06/25 23:29:55 drahn Exp $	*/
 /*	$NetBSD: if_gm.c,v 1.2 2000/03/04 11:17:00 tsubai Exp $	*/
 
 /*-
@@ -167,11 +167,8 @@ gmac_attach(parent, self, aux)
 	pci_chipset_tag_t	pc = pa->pa_pc;
 	struct ifnet *ifp = &sc->sc_if;
 	struct mii_data *mii = &sc->sc_mii;
-	pci_intr_handle_t ih;
 	const char *intrstr = NULL;
 	char intrstrbuf[20];
-	bus_addr_t	iobase;
-	bus_size_t	iosize;
 	bus_addr_t	membase;
 	bus_size_t	memsize;
 #ifdef __NetBSD__
@@ -180,7 +177,6 @@ gmac_attach(parent, self, aux)
 	int i;
 	char *p;
 	struct gmac_dma *dp;
-	u_int32_t reg[10];
 	u_char laddr[6];
 
 #ifdef __NetBSD__
@@ -870,7 +866,6 @@ gmac_init(sc)
 {
 	struct ifnet *ifp = &sc->sc_if;
 	u_int x;
-	int i;
 
 	gmac_stop_txdma(sc);
 	gmac_stop_rxdma(sc);
diff --git a/sys/arch/powerpc/mac/if_wi_obio.c b/sys/arch/powerpc/mac/if_wi_obio.c
index 5a416f6692d..8d4c930f9b7 100644
--- a/sys/arch/powerpc/mac/if_wi_obio.c
+++ b/sys/arch/powerpc/mac/if_wi_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_obio.c,v 1.1 2001/06/25 18:11:12 drahn Exp $	*/
+/*	$OpenBSD: if_wi_obio.c,v 1.2 2001/06/25 23:29:56 drahn Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -111,7 +111,6 @@ wi_obio_attach(parent, self, aux)
 	struct wi_obio_softc	*psc = (struct wi_obio_softc *)self;
 	struct wi_softc		*sc = &psc->sc_wi;
 	struct confargs		*ca = aux;
-	int			state = 0;
 
 	printf(" irq %d:", ca->ca_intr[0]);
 
diff --git a/sys/arch/powerpc/mac/macintr.c b/sys/arch/powerpc/mac/macintr.c
index 4c8b3ca189c..88641d3d8af 100644
--- a/sys/arch/powerpc/mac/macintr.c
+++ b/sys/arch/powerpc/mac/macintr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macintr.c,v 1.9 2001/06/25 00:43:15 mickey Exp $	*/
+/*	$OpenBSD: macintr.c,v 1.10 2001/06/25 23:29:56 drahn Exp $	*/
 
 /*-
  * Copyright (c) 1995 Per Fogelstrom
@@ -162,7 +162,6 @@ macintr_attach(parent, self, aux)
 	void *aux;
 {
 	struct confargs *ca = aux;
-	struct macintr_softc *sc = (void *)self;
 	extern intr_establish_t *intr_establish_func;
 	extern intr_disestablish_t *intr_disestablish_func;
 
@@ -506,7 +505,7 @@ cntlzw(x)
 void
 mac_ext_intr()
 {
-	int i, irq = 0;
+	int irq = 0;
 	int o_imen, r_imen;
 	int pcpl;
 	struct intrhand *ih;
diff --git a/sys/arch/powerpc/mac/openpic.c b/sys/arch/powerpc/mac/openpic.c
index 2deea0340a6..41fd638f1ed 100644
--- a/sys/arch/powerpc/mac/openpic.c
+++ b/sys/arch/powerpc/mac/openpic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openpic.c,v 1.11 2001/06/25 00:43:15 mickey Exp $	*/
+/*	$OpenBSD: openpic.c,v 1.12 2001/06/25 23:29:56 drahn Exp $	*/
 
 /*-
  * Copyright (c) 1995 Per Fogelstrom
@@ -74,7 +74,6 @@ static char *intr_typename(int type);
 static void intr_calculatemasks();
 static __inline int cntlzw(int x);
 static int mapirq(int irq);
-static int read_irq();
 void openpic_enable_irq_mask(int irq_mask);
 
 extern u_int32_t *heathrow_FCR;
@@ -153,7 +152,6 @@ openpic_attach(parent, self, aux)
 	void *aux;
 {
 	struct confargs *ca = aux;
-	struct openpic_softc *sc = (void *)self;
 	extern intr_establish_t *intr_establish_func;
 	extern intr_disestablish_t *intr_disestablish_func;
 	extern intr_establish_t *mac_intr_establish_func;
diff --git a/sys/arch/powerpc/mac/uni_n.c b/sys/arch/powerpc/mac/uni_n.c
index 6b14bef51d5..1ec4e4b9537 100644
--- a/sys/arch/powerpc/mac/uni_n.c
+++ b/sys/arch/powerpc/mac/uni_n.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uni_n.c,v 1.3 2001/05/29 01:20:44 drahn Exp $	*/
+/*	$OpenBSD: uni_n.c,v 1.4 2001/06/25 23:29:57 drahn Exp $	*/
 
 /*
  * Copyright (c) 1998-2001 Dale Rahn. All rights reserved.
@@ -62,10 +62,7 @@ memcmatch(parent, cf, aux)
 	void *aux;
 {
 	struct confargs *ca = aux;
-	int node;
 	static int memc_attached = 0;
-	int len;
-	char name[64];
 
 	/* allow only one instance */
 	if (memc_attached == 0) {
@@ -84,8 +81,6 @@ memcattach(parent, self, aux)
 	struct confargs *ca = aux;
 	int len;
 	char name[64];
-	u_int32_t address;
-	u_int32_t *ctladdr;
 	struct memc_softc *sc = (struct memc_softc *)self;
 
 	len = OF_getprop(ca->ca_node, "name", name, sizeof name);
diff --git a/sys/arch/powerpc/mac/wdc_obio.c b/sys/arch/powerpc/mac/wdc_obio.c
index 5a48a1274dd..b2e0ec03b1f 100644
--- a/sys/arch/powerpc/mac/wdc_obio.c
+++ b/sys/arch/powerpc/mac/wdc_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc_obio.c,v 1.8 2001/03/25 13:11:58 csapuntz Exp $	*/
+/*	$OpenBSD: wdc_obio.c,v 1.9 2001/06/25 23:29:57 drahn Exp $	*/
 /*	$NetBSD: wdc_obio.c,v 1.4 1999/06/14 08:53:06 tsubai Exp $	*/
 
 /*-
@@ -146,8 +146,6 @@ wdc_obio_attach(parent, self, aux)
 	int use_dma = 1;
 	bus_addr_t cmdbase;
 	bus_size_t cmdsize;
-	bus_addr_t ctlbase;
-	bus_size_t ctlsize;
 
 	if (sc->sc_wdcdev.sc_dev.dv_cfdata->cf_flags & WDC_OPTIONS_DMA) {
 		if (ca->ca_nreg >= 16 || ca->ca_nintr == -1)
diff --git a/sys/arch/powerpc/pci/mpcpcibus.c b/sys/arch/powerpc/pci/mpcpcibus.c
index 2c840b94835..08784d3d9e2 100644
--- a/sys/arch/powerpc/pci/mpcpcibus.c
+++ b/sys/arch/powerpc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpcpcibus.c,v 1.28 2001/06/25 04:52:35 drahn Exp $ */
+/*	$OpenBSD: mpcpcibus.c,v 1.29 2001/06/25 23:29:59 drahn Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -157,12 +157,7 @@ mpcpcibrmatch(parent, match, aux)
 	void *match, *aux;
 {
 	struct confargs *ca = aux;
-	int handle; 
 	int found = 0;
-	int err;
-	unsigned int val;
-	int qhandle;
-	char type[32];
 
 	if (strcmp(ca->ca_name, mpcpcibr_cd.cd_name) != 0)
 		return (found);
@@ -187,8 +182,6 @@ mpcpcibrattach(parent, self, aux)
 	int map, node;
 	char *bridge;
 	int of_node = 0;
-	u_int32_t base;
-	u_int32_t size;
 
 	switch(system_type) {
 	case POWER4e:
@@ -343,11 +336,13 @@ mpcpcibrattach(parent, self, aux)
 			char compat[32];
 			u_int32_t addr_offset;
 			u_int32_t data_offset;
+#if 0
 			struct pci_reserve_mem null_reserve = {
 				0,
 				0,
 				0
 			};
+#endif
 			int i;
 			int len;
 			int rangelen;
@@ -609,7 +604,6 @@ find_node_intr(node, addr, intr)
 	u_int32_t map[64], *mp;
 	u_int32_t imask[8], maskedaddr[8];
 	u_int32_t icells;
-	char name [32];
 
 	len = OF_getprop(node, "AAPL,interrupts", intr, 4);
 	if (len == 4)
@@ -872,9 +866,7 @@ mpc_conf_read(cpv, tag, offset)
 
 	pcireg_t data;
 	u_int32_t reg;
-	int device;
 	int s;
-	int handle; 
 	int daddr = 0;
 
 	if(offset & 3 || offset < 0 || offset >= 0x100) {
@@ -927,7 +919,6 @@ mpc_conf_write(cpv, tag, offset, data)
 	struct pcibr_config *cp = cpv;
 	u_int32_t reg;
 	int s;
-	int handle; 
 	int daddr = 0;
 
 	reg = mpc_gen_config_reg(cpv, tag, offset);
@@ -962,6 +953,7 @@ mpc_conf_write(cpv, tag, offset, data)
 }
 
 
+/*ARGSUSED*/
 int
 mpc_intr_map(lcv, bustag, buspin, line, ihp)
 	void *lcv;
@@ -969,12 +961,7 @@ mpc_intr_map(lcv, bustag, buspin, line, ihp)
 	int buspin, line;
 	pci_intr_handle_t *ihp;
 {
-	struct pcibr_config *lcp = lcv;
-	pci_chipset_tag_t pc = &lcp->lc_pc; 
 	int error = 0;
-	int route;
-	int lvl;
-	int device;
 
 	*ihp = -1;
         if (buspin == 0) {
diff --git a/sys/arch/powerpc/pci/pchb.c b/sys/arch/powerpc/pci/pchb.c
index 1a6f035bc3b..6c38c96df06 100644
--- a/sys/arch/powerpc/pci/pchb.c
+++ b/sys/arch/powerpc/pci/pchb.c
@@ -91,13 +91,12 @@ pchbmatch(parent, cf, aux)
 	return (0);
 }
 
+/*ARGSUSED*/
 void
 pchbattach(parent, self, aux)
 	struct device *parent, *self;
 	void *aux;
 {
-	struct pci_attach_args *pa = aux;
-	char devinfo[256];
 
 	printf("\n");
 
diff --git a/sys/arch/powerpc/pci/pcibrvar.h b/sys/arch/powerpc/pci/pcibrvar.h
index 7ee842fa3e5..b148b3929d3 100644
--- a/sys/arch/powerpc/pci/pcibrvar.h
+++ b/sys/arch/powerpc/pci/pcibrvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibrvar.h,v 1.7 2001/03/29 20:00:49 drahn Exp $ */
+/*	$OpenBSD: pcibrvar.h,v 1.8 2001/06/25 23:30:00 drahn Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -32,6 +32,10 @@
  *
  */
 
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcidevs.h>
+
 struct pcibr_config {
 	bus_space_tag_t lc_memt;
 	bus_space_tag_t lc_iot;
@@ -67,3 +71,7 @@ struct pci_reserve_mem {
 void pci_addr_fixup __P((struct pcibr_softc *, pci_chipset_tag_t, int,
 	struct pci_reserve_mem *));
 
+#define PCIADDR_SEARCH_IO  0
+#define PCIADDR_SEARCH_MEM 1
+struct extent *pciaddr_search __P((struct device *, int, bus_addr_t *, bus_size_t));
+
diff --git a/sys/arch/powerpc/pci/vgafb.c b/sys/arch/powerpc/pci/vgafb.c
index 57ff62c8649..92bd0828bd6 100644
--- a/sys/arch/powerpc/pci/vgafb.c
+++ b/sys/arch/powerpc/pci/vgafb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb.c,v 1.11 2001/06/24 23:11:24 drahn Exp $	*/
+/*	$OpenBSD: vgafb.c,v 1.12 2001/06/25 23:30:00 drahn Exp $	*/
 /*	$NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $	*/
 
 /*
@@ -67,10 +67,6 @@ void	vgafb_eraserows __P((void *, int, int));
 void	vgafb_alloc_attr __P((void *c, int fg, int bg, int flags, long *));
 
 void vgafb_setcolor __P((unsigned int index, u_int8_t r, u_int8_t g, u_int8_t b));
-static void drawChar ( struct vgafb_config *vc, char ch, int cx,
-	int cy, char at);
-static void setPixel( struct vgafb_config *vc, int x, int y, int v);
-static void vgafb_invert_char ( struct vgafb_config *vc, int cx, int cy);
 extern const char fontdata_8x16[];
 
 struct vgafb_devconfig {
@@ -143,9 +139,7 @@ vgafb_common_probe(iot, memt, iobase, iosize, membase, memsize, mmiobase, mmiosi
 	size_t iosize, memsize, mmiosize;
 {
 	bus_space_handle_t ioh_b, ioh_c, ioh_d, memh, mmioh;
-	u_int16_t vgadata;
 	int gotio_b, gotio_c, gotio_d, gotmem, gotmmio, rv;
-	int width;
 
 	gotio_b = gotio_c = gotio_d = gotmem = gotmmio = rv = 0;
 
@@ -222,8 +216,6 @@ vgafb_common_setup(iot, memt, vc, iobase, iosize, membase, memsize, mmiobase, mm
 	u_int32_t iobase, membase, mmiobase;
 	size_t iosize, memsize, mmiosize;
 {
-	int cpos;
-	int width, height;
 
         vc->vc_iot = iot;
         vc->vc_memt = memt;
@@ -325,7 +317,6 @@ vgafb_wsdisplay_attach(parent, vc, console)
 	int console;
 {
 	struct wsemuldisplaydev_attach_args aa;
-	struct wscons_odev_spec *wo;
 
         aa.console = console;
 	aa.scrdata = &vgafb_screenlist;
@@ -402,7 +393,6 @@ vgafb_mmap(v, offset, prot)
 {
 	struct vgafb_config *vc = v;
 	bus_space_handle_t h;
-	u_int32_t *port;
 
 	/* memsize... */
 	if (offset >= 0x00000 && offset < 0x800000)	/* 8MB of mem??? */
@@ -454,7 +444,6 @@ void
 vgafb_cnprobe(cp)
 	struct consdev *cp;
 {
-	int i, j;
 	if (cons_displaytype != 1) {
 		cp->cn_pri = CN_DEAD;
 		return;
diff --git a/sys/arch/powerpc/pci/vgafb_pci.c b/sys/arch/powerpc/pci/vgafb_pci.c
index 132b7e1e360..c90cda64950 100644
--- a/sys/arch/powerpc/pci/vgafb_pci.c
+++ b/sys/arch/powerpc/pci/vgafb_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb_pci.c,v 1.3 2001/06/10 15:20:17 drahn Exp $	*/
+/*	$OpenBSD: vgafb_pci.c,v 1.4 2001/06/25 23:30:01 drahn Exp $	*/
 /*	$NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $	*/
 
 /*
@@ -337,12 +337,9 @@ vgafb_pci_console(iot, ioaddr, iosize, memt, memaddr, memsize,
 	pci_chipset_tag_t pc;
 	int bus, device, function;
 {
-	extern bus_space_handle_t cons_display_mem_h;
 	struct vgafb_config *vc = &vgafb_pci_console_vc;
 	u_int32_t mmioaddr;
 	u_int32_t mmiosize;
-	int retval;
-	u_int32_t cacheable;
 	static struct pci_attach_args spa;
 	struct pci_attach_args *pa = &spa;
 
diff --git a/sys/arch/powerpc/powerpc/db_trace.c b/sys/arch/powerpc/powerpc/db_trace.c
index 11c3dffe9de..32c94f83213 100644
--- a/sys/arch/powerpc/powerpc/db_trace.c
+++ b/sys/arch/powerpc/powerpc/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.8 2001/06/24 22:00:13 drahn Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.9 2001/06/25 23:30:02 drahn Exp $	*/
 /*	$NetBSD: db_trace.c,v 1.15 1996/02/22 23:23:41 gwr Exp $	*/
 
 /* 
@@ -97,8 +97,6 @@ db_dumpframe (u_int32_t pframe)
 	u_int32_t nextframe;
 	u_int32_t lr;
 	u_int32_t *access;
-	db_sym_t  sym;
-	int error;
 	char *name;
 	db_expr_t offset;
 
@@ -127,11 +125,6 @@ db_stack_trace_cmd(addr, have_addr, count, modif)
 	db_expr_t	count;
 	char		*modif;
 {
-	int i, val, nargs, spa;
-	db_addr_t	regp;
-	char *		name;
-	boolean_t	kernel_only = TRUE;
-	boolean_t	trace_thread = FALSE;
 
 	if (have_addr == 0){
 		addr = ddb_regs.tf.fixreg[1];
diff --git a/sys/arch/powerpc/powerpc/machdep.c b/sys/arch/powerpc/powerpc/machdep.c
index 3010775165f..b5f5520a52f 100644
--- a/sys/arch/powerpc/powerpc/machdep.c
+++ b/sys/arch/powerpc/powerpc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.67 2001/06/25 00:43:16 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.68 2001/06/25 23:30:03 drahn Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -738,7 +738,6 @@ sendsig(catcher, sig, mask, code, type, val)
 	struct sigframe *fp, frame;
 	struct sigacts *psp = p->p_sigacts;
 	int oldonstack;
-	int pa;
 	
 	frame.sf_signum = sig;
 	
@@ -920,7 +919,6 @@ boot(howto)
 {
 	static int syncing;
 	static char str[256];
-	char *ap = str, *ap1 = ap;
 
 	boothowto = howto;
 	if (!cold && !(howto & RB_NOSYNC) && !syncing) {
@@ -1186,7 +1184,6 @@ bus_space_unmap(t, bsh, size)
 {
 	bus_addr_t sva;
 	bus_size_t off, len;
-	bus_addr_t bpa;
 
 	/* should this verify that the proper size is freed? */
 	sva = trunc_page(bsh);
@@ -1349,7 +1346,6 @@ __C(bus_space_copy_,BYTES)(v, h1, o1, h2, o2, c)			\
 	bus_space_handle_t h1, h2;					\
 	bus_size_t o1, o2, c;						\
 {									\
-	TYPE val;							\
 	TYPE *src, *dst;						\
 	int i;								\
 									\
diff --git a/sys/arch/powerpc/powerpc/mainbus.c b/sys/arch/powerpc/powerpc/mainbus.c
index d8790d363c2..2a5e1a16ea6 100644
--- a/sys/arch/powerpc/powerpc/mainbus.c
+++ b/sys/arch/powerpc/powerpc/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.6 2001/05/29 01:20:44 drahn Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.7 2001/06/25 23:30:04 drahn Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -56,13 +56,13 @@ void	mb_intr_disestablish __P((struct confargs *));
 caddr_t	mb_cvtaddr __P((struct confargs *));
 int	mb_matchname __P((struct confargs *, char *));
 
+/*ARGSUSED*/
 static int
 mbmatch(parent, cfdata, aux)
 	struct device *parent;
 	void *cfdata;
 	void *aux;
 {
-	struct cfdata *cf = cfdata;
 
 	/*
 	 * That one mainbus is always here.
diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c
index 2447d255a9b..463264c3d91 100644
--- a/sys/arch/powerpc/powerpc/trap.c
+++ b/sys/arch/powerpc/powerpc/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.25 2001/06/10 18:45:02 drahn Exp $	*/
+/*	$OpenBSD: trap.c,v 1.26 2001/06/25 23:30:04 drahn Exp $	*/
 /*	$NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $	*/
 
 /*
@@ -373,7 +373,6 @@ mpc_print_pci_stat();
 	{
 		char *errstr[8];
 		int errnum = 0;
-		int i;
 
 		if (frame->srr1 & (1<<(31-11))) { 
 			/* floating point enabled program exception */
diff --git a/sys/arch/powerpc/powerpc/vm_machdep.c b/sys/arch/powerpc/powerpc/vm_machdep.c
index addcc7b77c9..96d798dd0ff 100644
--- a/sys/arch/powerpc/powerpc/vm_machdep.c
+++ b/sys/arch/powerpc/powerpc/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.16 2001/06/08 08:09:23 art Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.17 2001/06/25 23:30:04 drahn Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.1 1996/09/30 16:34:57 ws Exp $	*/
 
 /*
@@ -196,10 +196,8 @@ cpu_coredump(p, vp, cred, chdr)
 {
 	struct coreseg cseg;
 	struct md_coredump md_core;
-	struct trapframe *tf;
 	int error;
 	
-#if 1
 	CORE_SETMAGIC(*chdr, COREMAGIC, MID_ZERO, 0);
 	chdr->c_hdrsize = ALIGN(sizeof *chdr);
 	chdr->c_seghdrsize = ALIGN(sizeof cseg);
@@ -221,7 +219,6 @@ cpu_coredump(p, vp, cred, chdr)
 		return error;
 
 	chdr->c_nseg++;
-#endif
 	return 0;
 }