Module Name: src
Committed By: riastradh
Date: Tue Apr 18 19:09:12 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/i386/conf: ALL GENERIC
src/sys/dev/usb: ualea.c usbdevices.config usbdevs
Log Message:
gson@ informs me the Alea I and II have the same USB product id.
Thus, ualea(4) should work for both of them. Rename USB product id
ARANEUS ALEA_II to ARANEUS ALEA to reflect this.
No functional change intended, except perhaps via usbdevs.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.456 -r1.457 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.416 -r1.417 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1153 -r1.1154 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/ualea.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/usbdevices.config
cvs rdiff -u -r1.731 -r1.732 src/sys/dev/usb/usbdevs
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/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.55 src/sys/arch/amd64/conf/ALL:1.56
--- src/sys/arch/amd64/conf/ALL:1.55 Mon Apr 17 08:59:37 2017
+++ src/sys/arch/amd64/conf/ALL Tue Apr 18 19:09:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.55 2017/04/17 08:59:37 riastradh Exp $
+# $NetBSD: ALL,v 1.56 2017/04/18 19:09:12 riastradh Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.55 $"
+#ident "ALL-$Revision: 1.56 $"
maxusers 64 # estimated number of users
@@ -1283,7 +1283,7 @@ ucom* at u3g?
ugensa* at uhub? port ?
ucom* at ugensa?
-# Araneus Alea II TRNG
+# Araneus Alea I/II TRNG
ualea* at uhub? port ? configuration ? interface ?
# IrDA and Consumer Ir devices
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.456 src/sys/arch/amd64/conf/GENERIC:1.457
--- src/sys/arch/amd64/conf/GENERIC:1.456 Mon Apr 17 08:59:37 2017
+++ src/sys/arch/amd64/conf/GENERIC Tue Apr 18 19:09:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.456 2017/04/17 08:59:37 riastradh Exp $
+# $NetBSD: GENERIC,v 1.457 2017/04/18 19:09:12 riastradh Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.456 $"
+#ident "GENERIC-$Revision: 1.457 $"
maxusers 64 # estimated number of users
@@ -1060,7 +1060,7 @@ ucom* at u3g?
ugensa* at uhub? port ?
ucom* at ugensa?
-# Araneus Alea II TRNG
+# Araneus Alea I/II TRNG
#ualea* at uhub? port ? configuration ? interface ?
# IrDA and Consumer Ir devices
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.416 src/sys/arch/i386/conf/ALL:1.417
--- src/sys/arch/i386/conf/ALL:1.416 Mon Apr 17 08:59:37 2017
+++ src/sys/arch/i386/conf/ALL Tue Apr 18 19:09:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.416 2017/04/17 08:59:37 riastradh Exp $
+# $NetBSD: ALL,v 1.417 2017/04/18 19:09:12 riastradh Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.416 $"
+#ident "ALL-$Revision: 1.417 $"
maxusers 64 # estimated number of users
@@ -1441,7 +1441,7 @@ ucom* at u3g?
ugensa* at uhub? port ?
ucom* at ugensa?
-# Araneus Alea II TRNG
+# Araneus Alea I/II TRNG
ualea* at uhub? port ? configuration ? interface ?
# IrDA and Consumer Ir devices
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1153 src/sys/arch/i386/conf/GENERIC:1.1154
--- src/sys/arch/i386/conf/GENERIC:1.1153 Mon Apr 17 08:59:37 2017
+++ src/sys/arch/i386/conf/GENERIC Tue Apr 18 19:09:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1153 2017/04/17 08:59:37 riastradh Exp $
+# $NetBSD: GENERIC,v 1.1154 2017/04/18 19:09:12 riastradh Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1153 $"
+#ident "GENERIC-$Revision: 1.1154 $"
maxusers 64 # estimated number of users
@@ -1360,7 +1360,7 @@ ucom* at u3g?
ugensa* at uhub? port ?
ucom* at ugensa?
-# Araneus Alea II TRNG
+# Araneus Alea I/II TRNG
#ualea* at uhub? port ? configuration ? interface ?
# IrDA and Consumer Ir devices
Index: src/sys/dev/usb/ualea.c
diff -u src/sys/dev/usb/ualea.c:1.4 src/sys/dev/usb/ualea.c:1.5
--- src/sys/dev/usb/ualea.c:1.4 Mon Apr 17 16:42:07 2017
+++ src/sys/dev/usb/ualea.c Tue Apr 18 19:09:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ualea.c,v 1.4 2017/04/17 16:42:07 riastradh Exp $ */
+/* $NetBSD: ualea.c,v 1.5 2017/04/18 19:09:12 riastradh Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ualea.c,v 1.4 2017/04/17 16:42:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ualea.c,v 1.5 2017/04/18 19:09:12 riastradh Exp $");
#include <sys/types.h>
#include <sys/atomic.h>
@@ -68,7 +68,7 @@ CFATTACH_DECL_NEW(ualea, sizeof(struct u
ualea_match, ualea_attach, ualea_detach, NULL);
static const struct usb_devno ualea_devs[] = {
- { USB_VENDOR_ARANEUS, USB_PRODUCT_ARANEUS_ALEA_II },
+ { USB_VENDOR_ARANEUS, USB_PRODUCT_ARANEUS_ALEA },
};
static int
Index: src/sys/dev/usb/usbdevices.config
diff -u src/sys/dev/usb/usbdevices.config:1.28 src/sys/dev/usb/usbdevices.config:1.29
--- src/sys/dev/usb/usbdevices.config:1.28 Mon Apr 17 08:59:37 2017
+++ src/sys/dev/usb/usbdevices.config Tue Apr 18 19:09:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: usbdevices.config,v 1.28 2017/04/17 08:59:37 riastradh Exp $
+# $NetBSD: usbdevices.config,v 1.29 2017/04/18 19:09:12 riastradh Exp $
#
# This file contains all USB related configuration.
# It is suitable for inclusion in a kernel config(5) file.
@@ -246,5 +246,5 @@ ubt* at uhub? port ?
aubtfwl* at uhub? port ? # load Atheros AR3k ubt(4) firmware
bthub* at ubt?
-# Araneus Alea II TRNG
+# Araneus Alea I/II TRNG
#ualea* at uhub? port ? configuration ? interface ?
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.731 src/sys/dev/usb/usbdevs:1.732
--- src/sys/dev/usb/usbdevs:1.731 Mon Apr 17 08:59:37 2017
+++ src/sys/dev/usb/usbdevs Tue Apr 18 19:09:12 2017
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.731 2017/04/17 08:59:37 riastradh Exp $
+$NetBSD: usbdevs,v 1.732 2017/04/18 19:09:12 riastradh Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -763,7 +763,7 @@ product AGFA SNAPSCANE26 0x2097 SnapScan
product AGFA SNAPSCANE52 0x20fd SnapScan e52
/* Araneus products */
-product ARANEUS ALEA_II 0x0001 Alea II TRNG
+product ARANEUS ALEA 0x0001 Alea I/II TRNG
/* Aincomm products */
product AINCOMM AWU2000B 0x1001 AWU2000B
