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

again.
This commit is contained in:
Peter Wemm 2002-05-24 05:21:36 +00:00
parent cae52cb693
commit 9c580bea80
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=97208
5 changed files with 16 additions and 13 deletions

View file

@ -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);
}

View file

@ -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);
}

View file

@ -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);
}
}

View file

@ -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

View file

@ -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;
}
}