diff options
| author | gibbs <gibbs@FreeBSD.org> | 1998-12-11 03:54:43 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1998-12-11 03:54:43 +0000 |
| commit | e8b75f9d73d1484c6406a0269b77f65e04899333 (patch) | |
| tree | 079a2e227c0f1cf1dee4c4f690934aed900ff1c7 /sys/cam | |
| parent | b22ca309468ff74419e854fd8f500b41e5f7dda2 (diff) | |
| download | FreeBSD-src-e8b75f9d73d1484c6406a0269b77f65e04899333.zip FreeBSD-src-e8b75f9d73d1484c6406a0269b77f65e04899333.tar.gz | |
Convert dadump to use reasonable data types so that some casting is unecessary.
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/scsi/scsi_da.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index bd0076f..7cd127a 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_da.c,v 1.13 1998/12/02 17:35:28 ken Exp $ + * $Id: scsi_da.c,v 1.14 1998/12/04 22:54:43 archie Exp $ */ #include "opt_hw_wdog.h" @@ -598,18 +598,18 @@ daioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) static int dadump(dev_t dev) { - struct cam_periph *periph; - struct da_softc *softc; - struct disklabel *lp; - u_int unit; - u_int part; - long num; /* number of sectors to write */ - long blkoff; - long blknum; - long blkcnt; - char *addr; + struct cam_periph *periph; + struct da_softc *softc; + struct disklabel *lp; + u_int unit; + u_int part; + long num; /* number of sectors to write */ + long blkoff; + long blknum; + long blkcnt; + vm_offset_t addr; static int dadoingadump = 0; - struct ccb_scsiio csio; + struct ccb_scsiio csio; /* toss any characters present prior to dump */ while (cncheckc() != -1) @@ -647,13 +647,13 @@ dadump(dev_t dev) blknum = dumplo + blkoff; blkcnt = PAGE_SIZE / softc->params.secsize; - addr = (char *)0; /* starting address */ + addr = 0; /* starting address */ while (num > 0) { - if (is_physical_memory((vm_offset_t)addr)) { + if (is_physical_memory(addr)) { pmap_enter(kernel_pmap, (vm_offset_t)CADDR1, - trunc_page((vm_offset_t)addr), VM_PROT_READ, TRUE); + trunc_page(addr), VM_PROT_READ, TRUE); } else { pmap_enter(kernel_pmap, (vm_offset_t)CADDR1, trunc_page(0), VM_PROT_READ, TRUE); @@ -687,7 +687,7 @@ dadump(dev_t dev) return(EIO); } - if ((intptr_t)addr % (1024 * 1024) == 0) { + if (addr % (1024 * 1024) == 0) { #ifdef HW_WDOG if (wdog_tickler) (*wdog_tickler)(); @@ -700,7 +700,7 @@ dadump(dev_t dev) /* update block count */ num -= blkcnt; blknum += blkcnt; - (long)addr += blkcnt * softc->params.secsize; + addr += blkcnt * softc->params.secsize; /* operator aborting dump? */ if (cncheckc() != -1) |
