Fix new gcc-3.1 warnings. I think this gets GENERIC compiling cleanly

again.

5 files changed, 16 insertions, 13 deletions

diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index ec2f012..78a959b 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -257,6 +257,7 @@ aha_free(struct aha_softc *aha)
 	case 1:
 		bus_dma_tag_destroy(aha->mailbox_dmat);
 	case 0:
+		break;
 	}
 	free(aha, M_DEVBUF);
 }
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index dcb7f90..740d626 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -425,6 +425,7 @@ ahbfree(struct ahb_softc *ahb)
 	case 1:
 		bus_dma_tag_destroy(ahb->buffer_dmat);
 	case 0:
+		break;
 	}
 	free(ahb, M_DEVBUF);
 }
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 1a062dd..3afedf9 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -2796,20 +2796,20 @@ rgb_vbi_prog( bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace )
 		    if ( notclipped(bktr, i, width)) {
 			split(bktr, (volatile u_long **) &dma_prog,
 			      bktr->y2 - bktr->y, OP_WRITE,
-			      Bpp, (volatile u_char **) &target,  cols);
+			      Bpp, (volatile u_char **)(uintptr_t)&target,  cols);
 	
 		    } else {
 			while(getline(bktr, i)) {
 			    if (bktr->y != bktr->y2 ) {
 				split(bktr, (volatile u_long **) &dma_prog,
 				      bktr->y2 - bktr->y, OP_WRITE,
-				      Bpp, (volatile u_char **) &target, cols);
+				      Bpp, (volatile u_char **)(uintptr_t)&target, cols);
 			    }
 			    if (bktr->yclip != bktr->yclip2 ) {
 				split(bktr,(volatile u_long **) &dma_prog,
 				      bktr->yclip2 - bktr->yclip,
 				      OP_SKIP,
-				      Bpp, (volatile u_char **) &target,  cols);
+				      Bpp, (volatile u_char **)(uintptr_t)&target,  cols);
 			    }
 			}
 			
@@ -2853,19 +2853,19 @@ rgb_vbi_prog( bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace )
 		    if ( notclipped(bktr, i, width)) {
 			split(bktr, (volatile u_long **) &dma_prog,
 			      bktr->y2 - bktr->y, OP_WRITE,
-			      Bpp, (volatile u_char **) &target,  cols);
+			      Bpp, (volatile u_char **)(uintptr_t)&target,  cols);
 		    } else {
 			while(getline(bktr, i)) {
 			    if (bktr->y != bktr->y2 ) {
 				split(bktr, (volatile u_long **) &dma_prog,
 				      bktr->y2 - bktr->y, OP_WRITE,
-				      Bpp, (volatile u_char **) &target,
+				      Bpp, (volatile u_char **)(uintptr_t)&target,
 				      cols);
 			    }	
 			    if (bktr->yclip != bktr->yclip2 ) {
 				split(bktr, (volatile u_long **) &dma_prog,
 				      bktr->yclip2 - bktr->yclip, OP_SKIP,
-				      Bpp, (volatile u_char **)  &target,  cols);
+				      Bpp, (volatile u_char **)(uintptr_t) &target,  cols);
 			    }	
 
 			}	
@@ -2950,20 +2950,20 @@ rgb_prog( bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace )
 	    if ( notclipped(bktr, i, width)) {
 		split(bktr, (volatile u_long **) &dma_prog,
 		      bktr->y2 - bktr->y, OP_WRITE,
-		      Bpp, (volatile u_char **) &target,  cols);
+		      Bpp, (volatile u_char **)(uintptr_t)&target,  cols);
 
 	    } else {
 		while(getline(bktr, i)) {
 		    if (bktr->y != bktr->y2 ) {
 			split(bktr, (volatile u_long **) &dma_prog,
 			      bktr->y2 - bktr->y, OP_WRITE,
-			      Bpp, (volatile u_char **) &target, cols);
+			      Bpp, (volatile u_char **)(uintptr_t)&target, cols);
 		    }
 		    if (bktr->yclip != bktr->yclip2 ) {
 			split(bktr,(volatile u_long **) &dma_prog,
 			      bktr->yclip2 - bktr->yclip,
 			      OP_SKIP,
-			      Bpp, (volatile u_char **) &target,  cols);
+			      Bpp, (volatile u_char **)(uintptr_t)&target,  cols);
 		    }
 		}
 
@@ -3016,19 +3016,19 @@ rgb_prog( bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace )
 		    if ( notclipped(bktr, i, width)) {
 			split(bktr, (volatile u_long **) &dma_prog,
 			      bktr->y2 - bktr->y, OP_WRITE,
-			      Bpp, (volatile u_char **) &target,  cols);
+			      Bpp, (volatile u_char **)(uintptr_t)&target,  cols);
 		    } else {
 			while(getline(bktr, i)) {
 			    if (bktr->y != bktr->y2 ) {
 				split(bktr, (volatile u_long **) &dma_prog,
 				      bktr->y2 - bktr->y, OP_WRITE,
-				      Bpp, (volatile u_char **) &target,
+				      Bpp, (volatile u_char **)(uintptr_t)&target,
 				      cols);
 			    }	
 			    if (bktr->yclip != bktr->yclip2 ) {
 				split(bktr, (volatile u_long **) &dma_prog,
 				      bktr->yclip2 - bktr->yclip, OP_SKIP,
-				      Bpp, (volatile u_char **)  &target,  cols);
+				      Bpp, (volatile u_char **)(uintptr_t)&target,  cols);
 			    }	
 
 			}	
diff --git a/sys/dev/em/if_em_phy.c b/sys/dev/em/if_em_phy.c
index 76ffaae..38606f2 100644
--- a/sys/dev/em/if_em_phy.c
+++ b/sys/dev/em/if_em_phy.c
@@ -1354,7 +1354,7 @@ em_display_mii(struct em_shared_adapter *shared)
 
     return;
 }
-#endif // DBG
+#endif /* DBG */
 
 /******************************************************************************
 * Probes the expected PHY address for known PHY IDs
diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c
index 403d9d8..df194a4 100644
--- a/sys/dev/twe/twe_freebsd.c
+++ b/sys/dev/twe/twe_freebsd.c
@@ -953,6 +953,7 @@ twe_setup_data_dmamap(void *arg, bus_dma_segment_t *segs, int nsegments, int err
 	break;
     default:
 	/* no s/g list, nothing to do */
+	break;
     }
 }