Module Name: src
Committed By: andvar
Date: Sat Aug 26 22:12:45 UTC 2023
Modified Files:
src/sys/arch/amiga/pci: p5pb.c
Log Message:
amiga/p5pb(4): move parent_dict definition/assignment to #if NGENFB > 0 block,
where it is only used in P5PB_CONSOLE code.
fixes P5PB_CONSOLE enabled build, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amiga/pci/p5pb.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/amiga/pci/p5pb.c
diff -u src/sys/arch/amiga/pci/p5pb.c:1.19 src/sys/arch/amiga/pci/p5pb.c:1.20
--- src/sys/arch/amiga/pci/p5pb.c:1.19 Sat Aug 7 16:18:42 2021
+++ src/sys/arch/amiga/pci/p5pb.c Sat Aug 26 22:12:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: p5pb.c,v 1.19 2021/08/07 16:18:42 thorpej Exp $ */
+/* $NetBSD: p5pb.c,v 1.20 2023/08/26 22:12:45 andvar Exp $ */
/*-
* Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
@@ -658,7 +658,7 @@ p5pb_conf_search(struct p5pb_softc *sc,
void
p5pb_device_register(device_t dev, void *aux)
{
- prop_dictionary_t dict, parent_dict;
+ prop_dictionary_t dict;
struct pci_attach_args *pa = aux;
if (device_parent(dev) && device_is_a(device_parent(dev), "pci")) {
@@ -676,9 +676,6 @@ p5pb_device_register(device_t dev, void
&& (PCI_PRODUCT(pa->pa_id) ==
PCI_PRODUCT_3DFX_VOODOO3) )) {
- parent_dict = device_properties(
- device_parent(device_parent(dev)));
-
prop_dictionary_set_uint32(dict, "width",
P5GFX_WIDTH);
@@ -689,6 +686,11 @@ p5pb_device_register(device_t dev, void
P5GFX_DEPTH);
#if NGENFB > 0
+ prop_dictionary_t parent_dict;
+
+ parent_dict = device_properties(
+ device_parent(device_parent(dev)));
+
prop_dictionary_set_uint32(dict, "linebytes",
P5GFX_LINEBYTES);
