Module Name: src
Committed By: tsutsui
Date: Sat May 4 08:30:06 UTC 2019
Modified Files:
src/sys/arch/atari/pci: pci_machdep.c pci_vga.c
Log Message:
Use proper integer types for PCI configuration registers.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/atari/pci/pci_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/atari/pci/pci_vga.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/atari/pci/pci_machdep.c
diff -u src/sys/arch/atari/pci/pci_machdep.c:1.57 src/sys/arch/atari/pci/pci_machdep.c:1.58
--- src/sys/arch/atari/pci/pci_machdep.c:1.57 Sat May 4 08:20:05 2019
+++ src/sys/arch/atari/pci/pci_machdep.c Sat May 4 08:30:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.57 2019/05/04 08:20:05 tsutsui Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.58 2019/05/04 08:30:06 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.57 2019/05/04 08:20:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.58 2019/05/04 08:30:06 tsutsui Exp $");
#include "opt_mbtype.h"
@@ -228,7 +228,7 @@ init_pci_bus(void)
pcitag_t tag;
pcireg_t csr;
int device, maxndevs;
- int id;
+ uint32_t id;
tag = 0;
id = 0;
@@ -328,7 +328,7 @@ enable_pci_devices(void)
PCI_MEMREG iolist;
struct pci_memreg *p, *q;
int dev, reg;
- int id, class;
+ uint32_t id, class;
pcitag_t tag;
pcireg_t csr, address, mask;
pci_chipset_tag_t pc;
Index: src/sys/arch/atari/pci/pci_vga.c
diff -u src/sys/arch/atari/pci/pci_vga.c:1.15 src/sys/arch/atari/pci/pci_vga.c:1.16
--- src/sys/arch/atari/pci/pci_vga.c:1.15 Sat May 4 08:20:05 2019
+++ src/sys/arch/atari/pci/pci_vga.c Sat May 4 08:30:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_vga.c,v 1.15 2019/05/04 08:20:05 tsutsui Exp $ */
+/* $NetBSD: pci_vga.c,v 1.16 2019/05/04 08:30:06 tsutsui Exp $ */
/*
* Copyright (c) 1999 Leo Weppelman. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_vga.c,v 1.15 2019/05/04 08:20:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_vga.c,v 1.16 2019/05/04 08:30:06 tsutsui Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -76,9 +76,9 @@ check_for_vga(bus_space_tag_t iot, bus_s
pci_chipset_tag_t pc = NULL; /* XXX */
bus_space_handle_t ioh_regs, memh_fb;
pcitag_t tag;
- int device, found, id, maxndevs, i, j;
+ int device, found, maxndevs, i, j;
int got_ioh, got_memh, rv;
- int class;
+ uint32_t id, class;
volatile uint8_t *regs;
uint8_t *fb;
const char *nbd = "NetBSD/Atari";
