CVS commit: src/sys/arch/hpcmips/vr

[Andrius Varanavicius]

Module Name:    src
Committed By:   andvar
Date:           Tue Sep 12 19:32:00 UTC 2023

Modified Files:
        src/sys/arch/hpcmips/vr: flash_vrip.c

Log Message:
rename flash_cd to vrflash_cd, since device was renamed to vrflash.

Fixes hpcmips LCARD config linking issue that flash_cd is undefined.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hpcmips/vr/flash_vrip.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/arch/hpcmips/vr/flash_vrip.c
diff -u src/sys/arch/hpcmips/vr/flash_vrip.c:1.14 src/sys/arch/hpcmips/vr/flash_vrip.c:1.15
--- src/sys/arch/hpcmips/vr/flash_vrip.c:1.14	Mon Sep 11 22:09:28 2023
+++ src/sys/arch/hpcmips/vr/flash_vrip.c	Tue Sep 12 19:32:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_vrip.c,v 1.14 2023/09/11 22:09:28 andvar Exp $ */
+/* $NetBSD: flash_vrip.c,v 1.15 2023/09/12 19:32:00 andvar Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flash_vrip.c,v 1.14 2023/09/11 22:09:28 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_vrip.c,v 1.15 2023/09/12 19:32:00 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -73,7 +73,7 @@ static int intel_write(struct flash_soft
 static int amd_erase(struct flash_softc *, bus_size_t);
 static int amd_write(struct flash_softc *, bus_size_t);
 
-extern struct cfdriver flash_cd;
+extern struct cfdriver vrflash_cd;
 
 CFATTACH_DECL_NEW(flash_vrip, sizeof(struct flash_softc),
 	      flash_probe, flash_attach, NULL, NULL);
@@ -83,7 +83,7 @@ dev_type_close(flashclose);
 dev_type_read(flashread);
 dev_type_write(flashwrite);
 
-const struct cdevsw flash_cdevsw = {
+const struct cdevsw vrflash_cdevsw = {
 	.d_open = flashopen,
 	.d_close = flashclose,
 	.d_read = flashread,
@@ -318,7 +318,7 @@ flashopen(dev_t dev, int flag, int mode,
 {
 	struct flash_softc	*sc;
 
-	sc = device_lookup_private(&flash_cd, minor(dev));
+	sc = device_lookup_private(&vrflash_cd, minor(dev));
 	if (sc == NULL)
 		return ENXIO;
 	if (sc->sc_status & FLASH_ST_BUSY)
@@ -332,7 +332,7 @@ flashclose(dev_t dev, int flag, int mode
 {
 	struct flash_softc	*sc;
 
-	sc = device_lookup_private(&flash_cd, minor(dev));
+	sc = device_lookup_private(&vrflash_cd, minor(dev));
 	sc->sc_status &= ~FLASH_ST_BUSY;
 	return 0;
 }
@@ -348,7 +348,7 @@ flashread(dev_t dev, struct uio *uio, in
 	int			count;
 	int			error;
 
-	sc = device_lookup_private(&flash_cd, minor(dev));
+	sc = device_lookup_private(&vrflash_cd, minor(dev));
 	iot = sc->sc_iot;
 	ioh = sc->sc_ioh;
 
@@ -375,7 +375,7 @@ flashwrite(dev_t dev, struct uio *uio, i
 	int			stat;
 	int			error;
 
-	sc = device_lookup_private(&flash_cd, minor(dev));
+	sc = device_lookup_private(&vrflash_cd, minor(dev));
 
 	if (sc->sc_size < uio->uio_offset + uio->uio_resid)
 		return ENOSPC;