Module Name: src
Committed By: martin
Date: Sat Feb 22 18:42:47 UTC 2014
Modified Files:
src/sys/arch/alpha/conf: files.alpha
src/sys/arch/alpha/pci: tsc.c
Log Message:
Allow kernels without tsciic to build.
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/arch/alpha/conf/files.alpha
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/alpha/pci/tsc.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/alpha/conf/files.alpha
diff -u src/sys/arch/alpha/conf/files.alpha:1.186 src/sys/arch/alpha/conf/files.alpha:1.187
--- src/sys/arch/alpha/conf/files.alpha:1.186 Fri Feb 21 12:23:30 2014
+++ src/sys/arch/alpha/conf/files.alpha Sat Feb 22 18:42:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.186 2014/02/21 12:23:30 jdc Exp $
+# $NetBSD: files.alpha,v 1.187 2014/02/22 18:42:47 martin Exp $
#
# alpha-specific configuration info
@@ -277,7 +277,7 @@ file arch/alpha/pci/tsp_bus_mem.c tsp
device tsciic: i2cbus, i2c_bitbang
attach tsciic at tsc
-file arch/alpha/pci/tsciic.c tsciic
+file arch/alpha/pci/tsciic.c tsciic needs-flag
device ttwoga { hose = -1 }
attach ttwoga at mainbus
Index: src/sys/arch/alpha/pci/tsc.c
diff -u src/sys/arch/alpha/pci/tsc.c:1.23 src/sys/arch/alpha/pci/tsc.c:1.24
--- src/sys/arch/alpha/pci/tsc.c:1.23 Fri Feb 21 12:23:30 2014
+++ src/sys/arch/alpha/pci/tsc.c Sat Feb 22 18:42:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tsc.c,v 1.23 2014/02/21 12:23:30 jdc Exp $ */
+/* $NetBSD: tsc.c,v 1.24 2014/02/22 18:42:47 martin Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.23 2014/02/21 12:23:30 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.24 2014/02/22 18:42:47 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,6 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.23
#include <alpha/pci/tsreg.h>
#include <alpha/pci/tsvar.h>
+#include "tsciic.h"
+
#ifdef DEC_6600
#include <alpha/pci/pci_6600.h>
#endif
@@ -88,7 +90,9 @@ static void tsciicattach(device_t, devic
CFATTACH_DECL_NEW(tsciic, sizeof(struct tsciic_softc), tsciicmatch,
tsciicattach, NULL, NULL);
+#if NTSCIIC
extern struct cfdriver tsciic_cd;
+#endif
/* There can be only one */
static int tscfound;
@@ -310,12 +314,16 @@ tsp_bus_get_window(int type, int window,
static int
tsciicmatch(device_t parent, cfdata_t match, void *aux)
{
+#if NTSCIIC
struct tsciic_attach_args *t = aux;
+#endif
switch (cputype) {
case ST_DEC_6600:
case ST_DEC_TITAN:
+#if NTSCIIC
return strcmp(t->tsciic_name, tsciic_cd.cd_name) == 0;
+#endif
default:
return 0;
}
@@ -324,7 +332,9 @@ tsciicmatch(device_t parent, cfdata_t ma
static void
tsciicattach(device_t parent, device_t self, void *aux)
{
+#if NTSCIIC
tsciic_init(self);
+#endif
}
void
