Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Sync to head.

  • Loading branch information...
commit 97c62c3328584a1583d040be29a74988e9d2de0f 1 parent a7d657e
chris authored
Showing with 9 additions and 19 deletions.
  1. +8 −11 sys/arch/cats/cats/autoconf.c
  2. +1 −8 sys/arch/cats/conf/files.cats
View
19 sys/arch/cats/cats/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.11.6.3 2008/01/01 16:01:38 chris Exp $ */
+/* $NetBSD: autoconf.c,v 1.11.6.4 2008/03/21 13:45:10 chris Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11.6.3 2008/01/01 16:01:38 chris Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11.6.4 2008/03/21 13:45:10 chris Exp $");
#include "opt_md.h"
@@ -68,9 +68,9 @@ static void
get_device(const char *name)
{
int unit, part;
- char devname[16], buf[32];
+ char devname[16];
const char *cp;
- struct device *dv;
+ device_t dv;
if (strncmp(name, "/dev/", 5) == 0)
name += 5;
@@ -91,13 +91,10 @@ get_device(const char *name)
part = *cp - 'a';
else if (*cp != '\0' && *cp != ' ')
return;
- sprintf(buf, "%s%d", devname, unit);
- TAILQ_FOREACH(dv, &alldevs, dv_list) {
- if (strcmp(buf, dv->dv_xname) == 0) {
- booted_device = dv;
- booted_partition = part;
- return;
- }
+
+ if ((dv = device_find_by_driver_unit(devname, unit)) != NULL) {
+ booted_device = dv;
+ booted_partition = part;
}
}
View
9 sys/arch/cats/conf/files.cats
@@ -1,4 +1,4 @@
-# $NetBSD: files.cats,v 1.34 2007/04/10 02:28:46 macallan Exp $
+# $NetBSD: files.cats,v 1.34.14.1 2008/03/21 13:45:10 chris Exp $
#
# CATS-specific configuration info
#
@@ -71,9 +71,6 @@ file arch/arm/footbridge/isa/dsrtc.c ds1687rtc
# Machine-independent I2O drivers.
include "dev/i2o/files.i2o"
-# generic fb driver
-include "dev/wsfb/files.wsfb"
-
# PCI devices
#
@@ -87,10 +84,6 @@ file arch/cats/pci/pcib.c pcib
file arch/cats/pci/pciide_machdep.c pciide_common
-# Include WSCONS stuff
-include "dev/wscons/files.wscons"
-include "dev/rasops/files.rasops"
-include "dev/wsfont/files.wsfont"
include "dev/pckbport/files.pckbport"
# Include USB stuff
Please sign in to comment.
Something went wrong with that request. Please try again.