Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/flashctl fix one more flash_addr_t fallout



details:   https://anonhg.NetBSD.org/src/rev/2dc235a3e495
branches:  trunk
changeset: 763811:2dc235a3e495
user:      ahoka <ahoka%NetBSD.org@localhost>
date:      Mon Apr 04 18:30:07 2011 +0000

description:
fix one more flash_addr_t fallout

diffstat:

 usr.sbin/flashctl/flashctl.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r da5b7de6a819 -r 2dc235a3e495 usr.sbin/flashctl/flashctl.c
--- a/usr.sbin/flashctl/flashctl.c      Mon Apr 04 18:29:47 2011 +0000
+++ b/usr.sbin/flashctl/flashctl.c      Mon Apr 04 18:30:07 2011 +0000
@@ -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?



Home | Main Index | Thread Index | Old Index