Module Name: src
Committed By: tnn
Date: Sat Sep 14 15:12:12 UTC 2019
Modified Files:
src/sys/dev/spi: m25p.c spiflash.c
Log Message:
On second thought revert that. Let's open this can of worms some other day.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/spi/m25p.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/spi/spiflash.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/spi/m25p.c
diff -u src/sys/dev/spi/m25p.c:1.13 src/sys/dev/spi/m25p.c:1.14
--- src/sys/dev/spi/m25p.c:1.13 Sat Sep 14 14:41:23 2019
+++ src/sys/dev/spi/m25p.c Sat Sep 14 15:12:12 2019
@@ -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 */
Index: src/sys/dev/spi/spiflash.c
diff -u src/sys/dev/spi/spiflash.c:1.22 src/sys/dev/spi/spiflash.c:1.23
--- src/sys/dev/spi/spiflash.c:1.22 Sat Sep 14 14:41:23 2019
+++ src/sys/dev/spi/spiflash.c Sat Sep 14 15:12:12 2019
@@ -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_
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);
