Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys gson@ informs me the Alea I and II have the same USB pro...
details: https://anonhg.NetBSD.org/src/rev/fe367afd7e1f
branches: trunk
changeset: 823306:fe367afd7e1f
user: riastradh <riastradh%NetBSD.org@localhost>
date: Tue Apr 18 19:09:12 2017 +0000
description:
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.
diffstat:
sys/arch/amd64/conf/ALL | 6 +++---
sys/arch/amd64/conf/GENERIC | 6 +++---
sys/arch/i386/conf/ALL | 6 +++---
sys/arch/i386/conf/GENERIC | 6 +++---
sys/dev/usb/ualea.c | 6 +++---
sys/dev/usb/usbdevices.config | 4 ++--
sys/dev/usb/usbdevs | 4 ++--
7 files changed, 19 insertions(+), 19 deletions(-)
diffs (169 lines):
diff -r 70400d846585 -r fe367afd7e1f sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Tue Apr 18 19:04:25 2017 +0000
+++ b/sys/arch/amd64/conf/ALL Tue Apr 18 19:09:12 2017 +0000
@@ -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 @@
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 @@
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
diff -r 70400d846585 -r fe367afd7e1f sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Tue Apr 18 19:04:25 2017 +0000
+++ b/sys/arch/amd64/conf/GENERIC Tue Apr 18 19:09:12 2017 +0000
@@ -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 @@
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 @@
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
diff -r 70400d846585 -r fe367afd7e1f sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Tue Apr 18 19:04:25 2017 +0000
+++ b/sys/arch/i386/conf/ALL Tue Apr 18 19:09:12 2017 +0000
@@ -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 @@
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 @@
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
diff -r 70400d846585 -r fe367afd7e1f sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Tue Apr 18 19:04:25 2017 +0000
+++ b/sys/arch/i386/conf/GENERIC Tue Apr 18 19:09:12 2017 +0000
@@ -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 @@
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 @@
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
diff -r 70400d846585 -r fe367afd7e1f sys/dev/usb/ualea.c
--- a/sys/dev/usb/ualea.c Tue Apr 18 19:04:25 2017 +0000
+++ b/sys/dev/usb/ualea.c Tue Apr 18 19:09:12 2017 +0000
@@ -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 @@
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
diff -r 70400d846585 -r fe367afd7e1f sys/dev/usb/usbdevices.config
--- a/sys/dev/usb/usbdevices.config Tue Apr 18 19:04:25 2017 +0000
+++ b/sys/dev/usb/usbdevices.config Tue Apr 18 19:09:12 2017 +0000
@@ -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 @@
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 ?
diff -r 70400d846585 -r fe367afd7e1f sys/dev/usb/usbdevs
--- a/sys/dev/usb/usbdevs Tue Apr 18 19:04:25 2017 +0000
+++ b/sys/dev/usb/usbdevs Tue Apr 18 19:09:12 2017 +0000
@@ -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 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
Home |
Main Index |
Thread Index |
Old Index