Wed Aug 19 13:38:51 2009 UTC ()
s/PLAYSTATION/PlayStation/


(jmcneill)
diff -r1.11 -r1.12 src/sys/dev/usb/pseye.c
cvs diff -r1.11 -r1.12 src/sys/dev/usb/pseye.c (expand / switch to unified diff)

--- src/sys/dev/usb/pseye.c 2009/02/03 13:31:24 1.11
+++ src/sys/dev/usb/pseye.c 2009/08/19 13:38:51 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pseye.c,v 1.11 2009/02/03 13:31:24 jmcneill Exp $ */ 1/* $NetBSD: pseye.c,v 1.12 2009/08/19 13:38:51 jmcneill Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca> 4 * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -17,37 +17,37 @@ @@ -17,37 +17,37 @@
17 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 17 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
18 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 18 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
19 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 19 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26 * POSSIBILITY OF SUCH DAMAGE. 26 * POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29/* 29/*
30 * Sony PLAYSTATION(R) Eye Driver 30 * Sony PlayStation Eye Driver
31 * 31 *
32 * The only documentation we have for this part is based on a series 32 * The only documentation we have for this part is based on a series
33 * of forum postings by Jim Paris on ps2dev.org. Many thanks for 33 * of forum postings by Jim Paris on ps2dev.org. Many thanks for
34 * figuring this one out. 34 * figuring this one out.
35 * 35 *
36 * URL: http://forums.ps2dev.org/viewtopic.php?t=9238 36 * URL: http://forums.ps2dev.org/viewtopic.php?t=9238
37 */ 37 */
38 38
39#include <sys/cdefs.h> 39#include <sys/cdefs.h>
40__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.11 2009/02/03 13:31:24 jmcneill Exp $"); 40__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.12 2009/08/19 13:38:51 jmcneill Exp $");
41 41
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/systm.h> 43#include <sys/systm.h>
44#include <sys/device.h> 44#include <sys/device.h>
45#include <sys/malloc.h> 45#include <sys/malloc.h>
46#include <sys/fcntl.h> 46#include <sys/fcntl.h>
47#include <sys/conf.h> 47#include <sys/conf.h>
48#include <sys/poll.h> 48#include <sys/poll.h>
49#include <sys/bus.h> 49#include <sys/bus.h>
50#include <sys/mutex.h> 50#include <sys/mutex.h>
51#include <sys/kthread.h> 51#include <sys/kthread.h>
52#include <sys/condvar.h> 52#include <sys/condvar.h>
53#include <sys/module.h> 53#include <sys/module.h>
@@ -697,27 +697,27 @@ pseye_open(void *opaque, int flags) @@ -697,27 +697,27 @@ pseye_open(void *opaque, int flags)
697} 697}
698 698
699static void 699static void
700pseye_close(void *opaque) 700pseye_close(void *opaque)
701{ 701{
702 struct pseye_softc *sc = opaque; 702 struct pseye_softc *sc = opaque;
703 703
704 pseye_close_pipes(sc); 704 pseye_close_pipes(sc);
705} 705}
706 706
707static const char * 707static const char *
708pseye_get_devname(void *opaque) 708pseye_get_devname(void *opaque)
709{ 709{
710 return "PLAYSTATION(R) Eye"; 710 return "PlayStation Eye";
711} 711}
712 712
713static int 713static int
714pseye_enum_format(void *opaque, uint32_t index, struct video_format *format) 714pseye_enum_format(void *opaque, uint32_t index, struct video_format *format)
715{ 715{
716 if (index != 0) 716 if (index != 0)
717 return EINVAL; 717 return EINVAL;
718 return pseye_get_format(opaque, format); 718 return pseye_get_format(opaque, format);
719} 719}
720 720
721static int 721static int
722pseye_get_format(void *opaque, struct video_format *format) 722pseye_get_format(void *opaque, struct video_format *format)
723{ 723{