Module Name: src
Committed By: macallan
Date: Thu Feb 25 20:56:20 UTC 2010
Modified Files:
src/sys/dev/pci: wcfb.c
Log Message:
some cleanup
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/wcfb.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/pci/wcfb.c
diff -u src/sys/dev/pci/wcfb.c:1.1 src/sys/dev/pci/wcfb.c:1.2
--- src/sys/dev/pci/wcfb.c:1.1 Thu Feb 25 03:33:09 2010
+++ src/sys/dev/pci/wcfb.c Thu Feb 25 20:56:20 2010
@@ -1,7 +1,7 @@
-/* $NetBSD: wcfb.c,v 1.1 2010/02/25 03:33:09 macallan Exp $ */
+/* $NetBSD: wcfb.c,v 1.2 2010/02/25 20:56:20 macallan Exp $ */
/*-
- * Copyright (c) 2007 Michael Lorenz
+ * Copyright (c) 2010 Michael Lorenz
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wcfb.c,v 1.1 2010/02/25 03:33:09 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wcfb.c,v 1.2 2010/02/25 20:56:20 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,7 +154,6 @@
bool is_console;
char devinfo[256];
void *wtf;
- uint32_t *tcfb;
sc->sc_dev = self;
sc->putchar = NULL;
@@ -164,7 +163,7 @@
dict = device_properties(self);
prop_dictionary_get_bool(dict, "is_console", &is_console);
-if(!is_console) return;
+ if(!is_console) return;
sc->sc_memt = pa->pa_memt;
sc->sc_iot = pa->pa_iot;
@@ -347,6 +346,11 @@
* somewhere in a MD header and compile this code only if all are
* present
*/
+ /*
+ * PCI_IOAREA_PADDR is useless, that's what the IO tag is for
+ * the address isn't guaranteed to be the same on each host bridge
+ * either, never mind the fact that it would be a bus address
+ */
#ifdef PCI_MAGIC_IO_RANGE
/* allow to map our IO space */
if ((offset >= PCI_MAGIC_IO_RANGE) &&