Module Name: src Committed By: ahoka Date: Mon Apr 4 18:30:07 UTC 2011
Modified Files: src/usr.sbin/flashctl: flashctl.c Log Message: fix one more flash_addr_t fallout To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/flashctl/flashctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/flashctl/flashctl.c diff -u src/usr.sbin/flashctl/flashctl.c:1.2 src/usr.sbin/flashctl/flashctl.c:1.3 --- src/usr.sbin/flashctl/flashctl.c:1.2 Sun Mar 20 06:10:27 2011 +++ src/usr.sbin/flashctl/flashctl.c Mon Apr 4 18:30:07 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: flashctl.c,v 1.2 2011/03/20 06:10:27 ahoka Exp $ */ +/* $NetBSD: flashctl.c,v 1.3 2011/04/04 18:30:07 ahoka Exp $ */ /*- * Copyright (c) 2010 Department of Software Engineering, @@ -137,10 +137,10 @@ printf("\n"); /* TODO: humanize */ - printf("Capacity %jd Mbytes, %jd pages, %zu bytes/page\n", + printf("Capacity %jd Mbytes, %jd pages, %ju bytes/page\n", (intmax_t )ip.ip_flash_size / 1024 / 1024, (intmax_t )ip.ip_flash_size / ip.ip_page_size, - ip.ip_page_size); + (intmax_t )ip.ip_page_size); if (ip.ip_flash_type == FLASH_TYPE_NAND) { printf("Block size %jd Kbytes, %jd pages/block\n", @@ -150,7 +150,7 @@ } else if (!strcmp("badblocks", command)) { struct flash_info_params ip; struct flash_badblock_params bbp; - flash_addr_t addr; + flash_off_t addr; bool hasbad = false; error = ioctl(fd, FLASH_GET_INFO, &ip); @@ -185,7 +185,7 @@ printf("No bad blocks found.\n"); } } else if (!strcmp("markbad", command)) { - flash_addr_t address; + flash_off_t address; /* TODO: maybe we should let the user specify * multiple blocks?