This commit is contained in:
tnn 2019-09-14 14:41:23 +00:00
parent f216ee4b1a
commit 35a7abb119
2 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: m25p.c,v 1.12 2019/09/05 16:17:48 bouyer Exp $ */
/* $NetBSD: m25p.c,v 1.13 2019/09/14 14:41:23 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.12 2019/09/05 16:17:48 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.13 2019/09/14 14:41:23 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 */

View File

@ -1,4 +1,4 @@
/* $NetBSD: spiflash.c,v 1.21 2018/09/03 16:29:33 riastradh Exp $ */
/* $NetBSD: spiflash.c,v 1.22 2019/09/14 14:41:23 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.21 2018/09/03 16:29:33 riastradh Exp $");
__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.22 2019/09/14 14:41:23 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);