diff options
| author | tnn <tnn@NetBSD.org> | 2019-09-14 15:12:12 +0000 |
|---|---|---|
| committer | tnn <tnn@NetBSD.org> | 2019-09-14 15:12:12 +0000 |
| commit | ade6e363b91d808b4f2afab41ad1cedc4e8fe45f (patch) | |
| tree | fe49344da14c5d71d8da935afb73b732fe656acd /sys/dev/spi | |
| parent | 6d67c46b0d0dad5fa5fb959d29a6db8c85a55e3c (diff) | |
On second thought revert that. Let's open this can of worms some other day.
Diffstat (limited to 'sys/dev/spi')
| -rw-r--r-- | sys/dev/spi/m25p.c | 8 | ||||
| -rw-r--r-- | sys/dev/spi/spiflash.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/spi/m25p.c b/sys/dev/spi/m25p.c index 10fdc317761..371b853dd49 100644 --- a/sys/dev/spi/m25p.c +++ b/sys/dev/spi/m25p.c @@ -1,4 +1,4 @@ -/* $NetBSD: m25p.c,v 1.13 2019/09/14 14:41:23 tnn Exp $ */ +/* $NetBSD: m25p.c,v 1.14 2019/09/14 15:12:12 tnn Exp $ */ /*- * Copyright (c) 2006 Urbana-Champaign Independent Media Center. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.13 2019/09/14 14:41:23 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.14 2019/09/14 15:12:12 tnn Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,8 +88,8 @@ static const struct m25p_info { uint8_t mfgid; uint16_t devid; const char *name; - uint16_t size; /* in kB */ - uint16_t sector; /* in kB */ + uint16_t size; /* in KB */ + uint16_t sector; /* in KB */ uint16_t mhz; } m25p_infos[] = { { 0x16, 0x20, 0x2017, "STMicro M25P64", 8192, 64 }, /* 64Mbit */ diff --git a/sys/dev/spi/spiflash.c b/sys/dev/spi/spiflash.c index 907ec719a74..46b6ff4ac92 100644 --- a/sys/dev/spi/spiflash.c +++ b/sys/dev/spi/spiflash.c @@ -1,4 +1,4 @@ -/* $NetBSD: spiflash.c,v 1.22 2019/09/14 14:41:23 tnn Exp $ */ +/* $NetBSD: spiflash.c,v 1.23 2019/09/14 15:12:12 tnn Exp $ */ /*- * Copyright (c) 2006 Urbana-Champaign Independent Media Center. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.22 2019/09/14 14:41:23 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.23 2019/09/14 15:12:12 tnn Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -224,7 +224,7 @@ spiflash_attach(device_t parent, device_t self, void *aux) aprint_naive(": SPI flash\n"); aprint_normal(": %s SPI flash\n", sc->sc_name); /* XXX: note that this has to change for boot-sectored flash */ - aprint_normal_dev(self, "%d kB, %d sectors of %d kB each\n", + aprint_normal_dev(self, "%d KB, %d sectors of %d KB each\n", sc->sc_device_size / 1024, sc->sc_device_size / sc->sc_erase_size, sc->sc_erase_size / 1024); |
