4 files changed, 11 insertions, 11 deletions

diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index c9534af636f7a..ec456f6767813 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.61 1998/12/14 06:32:54 dillon Exp $ */
+/* $Id: brooktree848.c,v 1.62 1999/01/23 11:32:06 roger 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 
@@ -3184,7 +3184,7 @@ static bool_t split(bktr_reg_t * bktr, volatile u_long **dma_prog, int width ,
   /*     must be Blue.                                                      */
   start_skip = 0;
   if (( pf->type == METEOR_PIXTYPE_RGB ) && ( pf->Bpp == 3 ))
-	  switch ( ((uintptr_t) (void *) *target_buffer) % 4 ) {
+	  switch ( ((uintptr_t) (volatile void *) *target_buffer) % 4 ) {
 	  case 2 : start_skip = 4 ; break;
 	  case 1 : start_skip = 8 ; break;
 	  }
@@ -3207,7 +3207,7 @@ static bool_t split(bktr_reg_t * bktr, volatile u_long **dma_prog, int width ,
 
      *(*dma_prog)++ = operation | flag  | (width * pixel_width - skip);
      if (operation != OP_SKIP ) 
-	 *(*dma_prog)++ = (uintptr_t) (void *) *target_buffer;
+	 *(*dma_prog)++ = (uintptr_t) (volatile void *) *target_buffer;
 
      *target_buffer += width * pixel_width;
      bktr->current_col += width;
@@ -3238,7 +3238,7 @@ static bool_t split(bktr_reg_t * bktr, volatile u_long **dma_prog, int width ,
 	*(*dma_prog)++ = operation  | flag |
 	      (width * pixel_width / 2 - skip);
 	if (operation != OP_SKIP ) 
-	      *(*dma_prog)++ = (uintptr_t) (void *) *target_buffer ;
+	      *(*dma_prog)++ = (uintptr_t) (volatile void *) *target_buffer ;
 	*target_buffer +=  (width * pixel_width / 2) ;
 
 	if ( operation == OP_WRITE )
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index c9c79ec9740f5..1d1de89c59b6c 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.80 1998/09/25 18:06:53 matt Exp $	*/
-/*	$Id: if_de.c,v 1.93 1998/12/30 00:37:43 hoek Exp $ */
+/*	$Id: if_de.c,v 1.94 1999/01/27 23:45:41 dillon Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -2412,7 +2412,7 @@ tulip_srom_decode(
     /*
      * Save the hardware address.
      */
-    bcopy((caddr_t) shp->sh_ieee802_address, (caddr_t) sc->tulip_enaddr, 6);
+    bcopy((v_caddr_t) shp->sh_ieee802_address, (v_caddr_t) sc->tulip_enaddr, 6);
     /*
      * If this is a multiple port card, add the adapter index to the last
      * byte of the hardware address.  (if it isn't multiport, adding 0
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 350546e6ab4be..83deb25af287a 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.59 1998/12/14 05:47:27 dillon Exp $
+ *	$Id: if_fxp.c,v 1.60 1999/01/27 23:45:42 dillon Exp $
  */
 
 /*
@@ -1347,7 +1347,7 @@ fxp_init(xsc)
 #if defined(__NetBSD__)
 	bcopy(LLADDR(ifp->if_sadl), (void *)cb_ias->macaddr, 6);
 #else
-	bcopy(sc->arpcom.ac_enaddr, (void *)cb_ias->macaddr,
+	bcopy(sc->arpcom.ac_enaddr, (volatile void *)cb_ias->macaddr,
 	    sizeof(sc->arpcom.ac_enaddr));
 #endif /* __NetBSD__ */
 
@@ -1820,7 +1820,7 @@ fxp_mc_setup(sc)
 				break;
 			}
 			bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr),
-			    (void *) &sc->mcsp->mc_addr[nmcasts][0], 6);
+			    (volatile void *) &sc->mcsp->mc_addr[nmcasts][0], 6);
 			nmcasts++;
 		}
 	}
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index f13c919cf93b8..3eedc8a63cd9d 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -992,12 +992,12 @@ ugenpoll(dev, events, p)
 static int
 ugen_detach(device_t self)
 {       
-	char *devinfo = (char *) device_get_desc(self);
+	const char *devinfo = device_get_desc(self);
 
 	DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
 	if (devinfo) {
 		device_set_desc(self, NULL);
-		free(devinfo, M_USB);
+		free((void *)devinfo, M_USB);
 	}
 	return 0;
 }