Module Name: src
Committed By: mrg
Date: Sat Feb 25 10:26:24 UTC 2012
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: TODO.usbmp ehci.c ohci.c uhci.c
uhidev.c umass_scsipi.c umidi.c umidivar.h usb.c usbdi.c usbdivar.h
Log Message:
copyright maintenence.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/dev/usb/TODO.usbmp
cvs rdiff -u -r1.181.6.11 -r1.181.6.12 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.218.6.12 -r1.218.6.13 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.240.6.11 -r1.240.6.12 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.52.6.2 -r1.52.6.3 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.38.6.2 -r1.38.6.3 src/sys/dev/usb/umass_scsipi.c
cvs rdiff -u -r1.53.2.4 -r1.53.2.5 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.17.2.1 -r1.17.2.2 src/sys/dev/usb/umidivar.h
cvs rdiff -u -r1.125.6.10 -r1.125.6.11 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.134.2.11 -r1.134.2.12 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.93.8.8 -r1.93.8.9 src/sys/dev/usb/usbdivar.h
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/usb/TODO.usbmp
diff -u src/sys/dev/usb/TODO.usbmp:1.1.2.1 src/sys/dev/usb/TODO.usbmp:1.1.2.2
--- src/sys/dev/usb/TODO.usbmp:1.1.2.1 Sat Feb 25 07:59:03 2012
+++ src/sys/dev/usb/TODO.usbmp Sat Feb 25 10:26:23 2012
@@ -1,4 +1,4 @@
-$NetBSD: TODO.usbmp,v 1.1.2.1 2012/02/25 07:59:03 mrg Exp $
+$NetBSD: TODO.usbmp,v 1.1.2.2 2012/02/25 10:26:23 mrg Exp $
the majority of the USB MP device interface is documented in usbdivar.h.
@@ -134,9 +134,9 @@ driver testing: STATUS
- ugen
- pseye
- uvideo
- - auvitek
- - emdtv
- - ubt
+ - auvitek ? (must take kernel lock for scsipi)
+ - emdtv ? (must take kernel lock for scsipi)
+ - ubt ? (must take kernel lock for scsipi)
- aubtfwl
- u3ginit
ucom attachments:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.181.6.11 src/sys/dev/usb/ehci.c:1.181.6.12
--- src/sys/dev/usb/ehci.c:1.181.6.11 Thu Feb 23 09:25:04 2012
+++ src/sys/dev/usb/ehci.c Sat Feb 25 10:26:23 2012
@@ -1,13 +1,13 @@
-/* $NetBSD: ehci.c,v 1.181.6.11 2012/02/23 09:25:04 mrg Exp $ */
+/* $NetBSD: ehci.c,v 1.181.6.12 2012/02/25 10:26:23 mrg Exp $ */
/*
- * Copyright (c) 2004-2011 The NetBSD Foundation, Inc.
+ * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (lenn...@augustsson.net), Charles M. Hannum,
- * Jeremy Morse (jeremy.mo...@gmail.com), and Jared D. McNeill
- * (jmcne...@invisible.ca).
+ * Jeremy Morse (jeremy.mo...@gmail.com), Jared D. McNeill
+ * (jmcne...@invisible.ca) and Matthew R. Green (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.11 2012/02/23 09:25:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.12 2012/02/25 10:26:23 mrg Exp $");
#include "ohci.h"
#include "uhci.h"
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.218.6.12 src/sys/dev/usb/ohci.c:1.218.6.13
--- src/sys/dev/usb/ohci.c:1.218.6.12 Thu Feb 23 09:25:04 2012
+++ src/sys/dev/usb/ohci.c Sat Feb 25 10:26:23 2012
@@ -1,14 +1,14 @@
-/* $NetBSD: ohci.c,v 1.218.6.12 2012/02/23 09:25:04 mrg Exp $ */
+/* $NetBSD: ohci.c,v 1.218.6.13 2012/02/25 10:26:23 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
- * Copyright (c) 1998, 2004, 2005, 2011 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (lenn...@augustsson.net) at
* Carlstedt Research & Technology, Jared D. McNeill (jmcne...@invisible.ca)
- * and Matthew R. Green.
+ * and Matthew R. Green (m...@eterna.com.au).
* This code is derived from software contributed to The NetBSD Foundation
* by Charles M. Hannum.
*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.12 2012/02/23 09:25:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.13 2012/02/25 10:26:23 mrg Exp $");
#include "opt_usb.h"
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.240.6.11 src/sys/dev/usb/uhci.c:1.240.6.12
--- src/sys/dev/usb/uhci.c:1.240.6.11 Thu Feb 23 09:25:04 2012
+++ src/sys/dev/usb/uhci.c Sat Feb 25 10:26:23 2012
@@ -1,14 +1,14 @@
-/* $NetBSD: uhci.c,v 1.240.6.11 2012/02/23 09:25:04 mrg Exp $ */
+/* $NetBSD: uhci.c,v 1.240.6.12 2012/02/25 10:26:23 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
- * Copyright (c) 1998, 2004, 2011 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (lenn...@augustsson.net) at
* Carlstedt Research & Technology, Jared D. McNeill (jmcne...@invisible.ca)
- * and Matthew R. Green.
+ * and Matthew R. Green (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.11 2012/02/23 09:25:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.12 2012/02/25 10:26:23 mrg Exp $");
#include "opt_usb.h"
Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.52.6.2 src/sys/dev/usb/uhidev.c:1.52.6.3
--- src/sys/dev/usb/uhidev.c:1.52.6.2 Thu Feb 23 09:31:56 2012
+++ src/sys/dev/usb/uhidev.c Sat Feb 25 10:26:23 2012
@@ -1,12 +1,12 @@
-/* $NetBSD: uhidev.c,v 1.52.6.2 2012/02/23 09:31:56 mrg Exp $ */
+/* $NetBSD: uhidev.c,v 1.52.6.3 2012/02/25 10:26:23 mrg Exp $ */
/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (lenn...@augustsson.net) at
- * Carlstedt Research & Technology.
+ * Carlstedt Research & Technology and Matthew R. Green (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.52.6.2 2012/02/23 09:31:56 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.52.6.3 2012/02/25 10:26:23 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.38.6.2 src/sys/dev/usb/umass_scsipi.c:1.38.6.3
--- src/sys/dev/usb/umass_scsipi.c:1.38.6.2 Fri Feb 24 09:11:43 2012
+++ src/sys/dev/usb/umass_scsipi.c Sat Feb 25 10:26:24 2012
@@ -1,12 +1,12 @@
-/* $NetBSD: umass_scsipi.c,v 1.38.6.2 2012/02/24 09:11:43 mrg Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.38.6.3 2012/02/25 10:26:24 mrg Exp $ */
/*
- * Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
+ * Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (lenn...@augustsson.net) at
- * Carlstedt Research & Technology and by Charles M. Hamnnum.
+ * Carlstedt Research & Technology, Charles M. Hamnnum and Matthew R. Green.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.38.6.2 2012/02/24 09:11:43 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.38.6.3 2012/02/25 10:26:24 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_umass.h"
Index: src/sys/dev/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.53.2.4 src/sys/dev/usb/umidi.c:1.53.2.5
--- src/sys/dev/usb/umidi.c:1.53.2.4 Mon Feb 20 05:24:42 2012
+++ src/sys/dev/usb/umidi.c Sat Feb 25 10:26:24 2012
@@ -1,11 +1,12 @@
-/* $NetBSD: umidi.c,v 1.53.2.4 2012/02/20 05:24:42 mrg Exp $ */
+/* $NetBSD: umidi.c,v 1.53.2.5 2012/02/25 10:26:24 mrg Exp $ */
/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Takuya SHIOZAKI (tshio...@netbsd.org) and (full-size transfers, extended
- * hw_if) Chapman Flack (c...@netbsd.org).
+ * by Takuya SHIOZAKI (tshio...@netbsd.org), (full-size transfers, extended
+ * hw_if) Chapman Flack (c...@netbsd.org), and Matthew R. Green
+ * (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.53.2.4 2012/02/20 05:24:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.53.2.5 2012/02/25 10:26:24 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/dev/usb/umidivar.h
diff -u src/sys/dev/usb/umidivar.h:1.17.2.1 src/sys/dev/usb/umidivar.h:1.17.2.2
--- src/sys/dev/usb/umidivar.h:1.17.2.1 Sat Feb 18 07:35:10 2012
+++ src/sys/dev/usb/umidivar.h Sat Feb 25 10:26:24 2012
@@ -1,10 +1,11 @@
-/* $NetBSD: umidivar.h,v 1.17.2.1 2012/02/18 07:35:10 mrg Exp $ */
+/* $NetBSD: umidivar.h,v 1.17.2.2 2012/02/25 10:26:24 mrg Exp $ */
/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Takuya SHIOZAKI (tshio...@netbsd.org).
+ * by Takuya SHIOZAKI (tshio...@netbsd.org) and Matthew R. Green
+ * (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.125.6.10 src/sys/dev/usb/usb.c:1.125.6.11
--- src/sys/dev/usb/usb.c:1.125.6.10 Thu Feb 23 09:25:04 2012
+++ src/sys/dev/usb/usb.c Sat Feb 25 10:26:24 2012
@@ -1,12 +1,12 @@
-/* $NetBSD: usb.c,v 1.125.6.10 2012/02/23 09:25:04 mrg Exp $ */
+/* $NetBSD: usb.c,v 1.125.6.11 2012/02/25 10:26:24 mrg Exp $ */
/*
- * Copyright (c) 1998, 2002, 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (lenn...@augustsson.net) at
- * Carlstedt Research & Technology.
+ * Carlstedt Research & Technology and Matthew R. Green (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.125.6.10 2012/02/23 09:25:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.125.6.11 2012/02/25 10:26:24 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usb.h"
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.134.2.11 src/sys/dev/usb/usbdi.c:1.134.2.12
--- src/sys/dev/usb/usbdi.c:1.134.2.11 Thu Feb 23 09:25:04 2012
+++ src/sys/dev/usb/usbdi.c Sat Feb 25 10:26:24 2012
@@ -1,13 +1,13 @@
-/* $NetBSD: usbdi.c,v 1.134.2.11 2012/02/23 09:25:04 mrg Exp $ */
+/* $NetBSD: usbdi.c,v 1.134.2.12 2012/02/25 10:26:24 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
/*
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (lenn...@augustsson.net) at
- * Carlstedt Research & Technology.
+ * Carlstedt Research & Technology and Matthew R. Green (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134.2.11 2012/02/23 09:25:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134.2.12 2012/02/25 10:26:24 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usb.h"
Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.93.8.8 src/sys/dev/usb/usbdivar.h:1.93.8.9
--- src/sys/dev/usb/usbdivar.h:1.93.8.8 Thu Feb 23 09:25:03 2012
+++ src/sys/dev/usb/usbdivar.h Sat Feb 25 10:26:24 2012
@@ -1,13 +1,13 @@
-/* $NetBSD: usbdivar.h,v 1.93.8.8 2012/02/23 09:25:03 mrg Exp $ */
+/* $NetBSD: usbdivar.h,v 1.93.8.9 2012/02/25 10:26:24 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */
/*
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (lenn...@augustsson.net) at
- * Carlstedt Research & Technology.
+ * Carlstedt Research & Technology and Matthew R. Green (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
