openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
120,010 Commits 18 Branches 27 Tags 3.4 GiB
Commit Graph

47 Commits

Author SHA1 Message Date
Michael Krufky 3dfbe31f09 V4L/DVB (9248): sms1xxx: support two new revisions of the Hauppauge WinTV MiniStick 
Autodetect 2040:5520 and 2040:5530 as Hauppauge WinTV MiniStick

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
 2008-10-17 17:26:56 -03:00
Michael Krufky 3d843c92da V4L/DVB (8979): sms1xxx: Add new USB product ID for Hauppauge WinTV MiniStick 
2040:5510 is the same hardware as 2040:5500

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
 2008-10-04 22:44:58 -03:00
Michael Krufky 7a9b5fc5fd V4L/DVB (8978): sms1xxx: fix product name for Hauppauge WinTV MiniStick 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
 2008-10-04 22:44:52 -03:00
Michael Krufky 09a29b7715 V4L/DVB (8722): sms1xxx: fix typo in license header 
This should have read, "GNU General Public License version 2"
rather than, "GNU General Public License version 3"

This was actually a typo mass-blunder -- this is not a change in licence,
as the code was always GPLv2.

Signed-off-by: Uri Shkolnik <uris@siano-ms.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
 2008-09-03 18:37:01 -03:00
Adrian Bunk c5e0bd1a98 V4L/DVB (8453): sms1xxx: dvb/siano/: cleanups 
This patch contains the following cleanups:
- mark smscore_module_init() as __init
- mark smscore_module_exit as __exit
- make the following needlessly global code static:
  - smscoreapi.c: struct g_smscore_notifyees
  - smscoreapi.c: struct g_smscore_devices
  - smscoreapi.c: struct g_smscore_deviceslock
  - smscoreapi.c: struct g_smscore_registry
  - smscoreapi.c: struct g_smscore_registrylock
  - smscoreapi.c: smscore_module_init()
  - smscoreapi.c: smscore_module_exit()
  - smsdvb.c: struct g_smsdvb_clients
  - smsdvb.c: struct g_smsdvb_clientslock

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-26 12:54:08 -03:00
Michael Krufky 2c6a37bb07 V4L/DVB (8326): sms1xxx: fix missing #include <linux/types.h> 
Fix the build error:

smscoreapi.c:689: error: 'uintptr_t' undeclared

Thanks to Peter Schlaf for reporting this.

Cc: Peter Schlaf <peter.schlaf@web.de>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:24:53 -03:00
Michael Krufky f1f74aa2cf V4L/DVB (8322): sms1xxx: fix improper usage of asm/foo.h 
Fix the following warnings generated by checkpatch.pl:

WARNING: Use #include <linux/io.h> instead of <asm/io.h>
 251: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:30:
+#include <asm/io.h>

WARNING: Use #include <linux/scatterlist.h> instead of <asm/scatterlist.h>
 1566: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:29:
+#include <asm/scatterlist.h>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:24:49 -03:00
Michael Krufky 44f71c3fce V4L/DVB (8313): sms1xxx: add support for Hauppauge WinTV-Nova-T-MiniStick 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:24:15 -03:00
Michael Krufky a745f0a12c V4L/DVB (8312): sms1xxx: add firmware filenames to board properties for stellar and nova 
Assign the following firmware filenames:

sms1xxx-stellar-dvbt-01.fw
sms1xxx-nova-a-dvbt-01.fw
sms1xxx-nova-b-dvbt-01.fw

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:24:09 -03:00
Michael Krufky 1fbc3caff4 V4L/DVB (8311): sms1xxx: support device-specific firmware filenames on stellar usb1 sticks 
Add the capability to define device-specific firmware filenames for the SMS1010,
with a mechanism to fall back to the generic firmware if the device-specific
firmware is not present.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:24:03 -03:00
Michael Krufky b1d8f9f5b8 V4L/DVB (8310): sms1xxx: remove kmutex_t typedef 
remove typedef struct mutex kmutex_t
fix one line > 80 columns

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:23:58 -03:00
Michael Krufky 4411d29165 V4L/DVB (8309): sms1xxx: fix OOPS on 64 bit kernels due to a bad cast 
Fix the following build warning:

smscoreapi.c: In function 'smscore_detect_mode':
smscoreapi.c:689: warning: cast from pointer to integer of different size
smscoreapi.c:689: warning: cast to pointer from integer of different size
smscoreapi.c: In function 'smscore_set_device_mode':
smscoreapi.c:820: warning: cast from pointer to integer of different size
smscoreapi.c:820: warning: cast to pointer from integer of different size

...and fix the following OOPS on 64bit kernels:

[  717.263667] usb 6-4: new high speed USB device using ehci_hcd and address 2
[  717.396386] usb 6-4: configuration #1 chosen from 1 choice
[  717.473650] Unable to handle kernel paging request at 0000000000c02000 RIP:
[  717.473657]  [<ffffffff88db9edc>] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0
[  717.473669] PGD 3c6f7067 PUD 3d484067 PMD 0
[  717.473674] Oops: 0002 [1] SMP
[  717.473678] CPU 0
[Modules linked in snipped]
[  717.473773] Pid: 8380, comm: modprobe Tainted: P        2.6.24-16-generic #1
[  717.473776] RIP: 0010:[<ffffffff88db9edc>]  [<ffffffff88db9edc>] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0
[  717.473784] RSP: 0018:ffff81003d495ba8  EFLAGS: 00010206
[  717.473786] RAX: ffff81003d8cd8d0 RBX: ffff81003d8cd800 RCX: ffff81003d8cd8d0
[  717.473788] RDX: 0000000000000008 RSI: ffff81003f080070 RDI: ffff81003d8cd800
[  717.473791] RBP: 0000000000000004 R08: ffff81003ec0104b R09: ffffffffffffffff
[  717.473793] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000c02000
[  717.473796] R13: 00000000fffffff4 R14: ffff810000c02000 R15: ffff81003d8cd878
[  717.473799] FS:  00007f70a680f6e0(0000) GS:ffffffff805b0000(0000) knlGS:0000000000000000
[  717.473801] CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
[  717.473804] CR2: 0000000000c02000 CR3: 000000003c68b000 CR4: 00000000000006e0
[  717.473806] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[  717.473809] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
[  717.473812] Process modprobe (pid: 8380, threadinfo ffff81003d494000, task ffff81003d2fc000)
[  717.473814] Stack:  ffff81003d8cd800 ffff81003d8cd800 0000000000000000 ffff81003c6d8000
[  717.473820]  ffff81003dcac800 0000000000000008 ffffc20000787bb0 ffffffff88dba16c
[  717.473825]  ffff81003dcac800 000000000000000a 0000000000000000 ffffffff88dbb2fa
[  717.473829] Call Trace:
[  717.473866]  [<ffffffff88dba16c>] :sms1xxx:smscore_start_device+0x1c/0xb0
[  717.473885]  [<ffffffff88dbb2fa>] :sms1xxx:smsusb_probe+0x29a/0x670
[  717.473929]  [<ffffffff88dbaca0>] :sms1xxx:smsusb_sendrequest+0x0/0x30
[  717.473965]  [<ffffffff804614d9>] mutex_lock+0x9/0x20
[  717.473998]  [<ffffffff8806c42e>] :usbcore:usb_autopm_do_device+0x8e/0x130
[  717.474040]  [<ffffffff8806d33a>] :usbcore:usb_probe_interface+0xda/0x160
[  717.474067]  [<ffffffff803b9f4c>] driver_probe_device+0x9c/0x1b0
[  717.474091]  [<ffffffff803ba219>] __driver_attach+0xc9/0xd0
[  717.474107]  [<ffffffff803ba150>] __driver_attach+0x0/0xd0
[  717.474115]  [<ffffffff803b918d>] bus_for_each_dev+0x4d/0x80
[  717.474156]  [<ffffffff803b959c>] bus_add_driver+0xac/0x220
[  717.474203]  [<ffffffff8806cde9>] :usbcore:usb_register_driver+0xa9/0x120
[  717.474232]  [<ffffffff88dbb00b>] :sms1xxx:smsusb_register+0x1b/0x70
[  717.474243]  [<ffffffff88dba50c>] :sms1xxx:smscore_module_init+0x7c/0xb0
[  717.474253]  [<ffffffff80263b6e>] sys_init_module+0x18e/0x1a90
[  717.474426]  [<ffffffff8020c37e>] system_call+0x7e/0x83
[  717.474490]
[  717.474491]
[  717.474492] Code: 66 41 c7 04 24 9c 02 41 c6 44 24 02 00 4c 89 e6 41 c6 44 24
[  717.474506] RIP  [<ffffffff88db9edc>] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0
[  717.474513]  RSP <ffff81003d495ba8>
[  717.474515] CR2: 0000000000c02000
[  717.474521] ---[ end trace 52d9c6f207be106a ]---

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:23:52 -03:00
Michael Krufky 14a638cd3b V4L/DVB (8308): sms1xxx: Provide option to support Siano default usb ids 
Provide an option to enable / disable support for Siano's default usb ids.

This allows the support for Siano's USB IDs to be disabled, so that Siano's
external driver can be used, instead.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:23:47 -03:00
Michael Krufky eb383bddc5 V4L/DVB (8307): sms1xxx: change smsusb_driver.name to sms1xxx 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:23:43 -03:00
Michael Krufky 5068b7a449 V4L/DVB (8306): sms1xxx: log firmware download process by default 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:23:38 -03:00
Michael Krufky 0f2a1ee112 V4L/DVB (8305): sms1xxx: fix warning: format '%d' expects type 'int', but argument x has type 'size_t' 
Fix the following 64bit build warning:

make[2]: Entering directory `/usr/src/linux-headers-2.6.24-16-generic'
  CC [M]  smscoreapi.o
smscoreapi.c: In function 'smscore_load_firmware_from_file':
smscoreapi.c:604: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'
  CC [M]  smsusb.o
smsusb.c: In function 'smsusb1_load_firmware':
smsusb.c:216: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
smsusb.c:223: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:23:34 -03:00
Michael Krufky 8f37356b06 V4L/DVB (8303): sms1xxx: update MODULE_DESCRIPTION 
set MODULE_DESCRIPTION to "Driver for the Siano SMS1XXX USB dongle"

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:23:30 -03:00
Michael Krufky cf1cfe1ba7 V4L/DVB (8302): sms1xxx: fix Siano board names 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:23:25 -03:00
Michael Krufky 02aea4fb64 V4L/DVB (8301): sms1xxx: add capability to define device-specific firmware filenames 
Add the capability to define device-specific firmware filenames for the SMS1150,
with a mechanism to fall back to the generic firmware if the device-specific
firmware is not present.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:23:20 -03:00
Michael Krufky 2708e888c5 V4L/DVB (8300): sms1xxx: simplify smsusb_init_device switch..case block 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:23:15 -03:00
Michael Krufky 0c071f374f V4L/DVB (8299): sms1xxx: mark functions static 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:23:10 -03:00
Michael Krufky c65c7a652f V4L/DVB (8298): sms1xxx: remove redundant __func__ in sms_err macro 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:59 -03:00
Michael Krufky 2522dc1324 V4L/DVB (8297): sms1xxx: remove old printk macros 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:53 -03:00
Michael Krufky eb250942fe V4L/DVB (8296): sms1xxx: always show error messages 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:48 -03:00
Michael Krufky f14d56a99b V4L/DVB (8295): sms1xxx: add debug module option, to enable debug messages 
All dmesg spam turned off by default, for now.  Values for debug:

(info=1, adv=2 (or-able)

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:42 -03:00
Michael Krufky a0c0abcb1f V4L/DVB (8294): sms1xxx: move message formatting into printk macros 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:37 -03:00
Michael Krufky 068d6c0f5d V4L/DVB (8293): sms1xxx: create printk macros 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:31 -03:00
Michael Krufky 1c11d546b6 V4L/DVB (8292): sms1xxx: add code to allow device-specific functionality 
Set board ID in the usb_device_id table's driver_info field.
Use board name when registering the dvb adapter.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:27 -03:00
Michael Krufky dd5b2a5c2a V4L/DVB (8291): sms1xxx: change default_mode to 4 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:22 -03:00
Michael Krufky d3e72fe75e V4L/DVB (8290): sms1xxx: small cleanup 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:17 -03:00
Michael Krufky df0462e77e V4L/DVB (8289): sms1xxx: remove #if LINUX_VERSION_CODE checks 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:12 -03:00
Michael Krufky fbd05c8213 V4L/DVB (8288): sms1xxx: more cleanups 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:07 -03:00
Michael Krufky e080842c6c V4L/DVB (8287): sms1xxx: fix WARNING: unnecessary cast may hide bugs 
fix the following checkpatch.pl warning:

WARNING: unnecessary cast may hide bugs,
see http://c-faq.com/malloc/mallocnocast.html

596: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:540:
+	msg = (struct SmsMsgHdr_ST *) kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA);

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:22:03 -03:00
Michael Krufky 18245e18ee V4L/DVB (8286): sms1xxx: remove typedefs 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:59 -03:00
Michael Krufky ca78373687 V4L/DVB (8285): sms1xxx: more 80-column cleanups 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:54 -03:00
Michael Krufky 9f2113975a V4L/DVB (8284): sms1xxx: fix WARNING: printk() should include KERN_ facility level 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:44 -03:00
Michael Krufky 59bf6b8e85 V4L/DVB (8283): sms1xxx: 80-column cleanups 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:40 -03:00
Michael Krufky fa830e8a01 V4L/DVB (8282): sms1xxx: more codingstyle cleanups 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:35 -03:00
Michael Krufky f0333e3de0 V4L/DVB (8281): sms1xxx: remove INT / UINT typedefs 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:30 -03:00
Michael Krufky 822374165d V4L/DVB (8280): sms1xxx: more codingstyle cleanups 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:25 -03:00
Michael Krufky 73104fb3e4 V4L/DVB (8279): sms1xxx: #define usb vid:pid's 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:19 -03:00
Michael Krufky 494d24c527 V4L/DVB (8278): sms1xxx: more codingstyle cleanups 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:14 -03:00
Michael Krufky f17407a85d V4L/DVB (8277): sms1xxx: update latest siano drop to 1.2.17 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:09 -03:00
Michael Krufky 55ad310c2f V4L/DVB (8276): sms1xxx: codingstyle cleanup: "(foo*)" should be "(foo *)" 
ERROR: "(foo*)" should be "(foo *)"

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:05 -03:00
Michael Krufky a83ccdd6a9 V4L/DVB (8275): sms1xxx: codingstyle cleanup: "foo* bar"/"foo * bar" should be "foo *bar" 
ERROR: "foo* bar" should be "foo *bar"
ERROR: "foo * bar" should be "foo *bar"

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:21:01 -03:00
Michael Krufky 18658117ff V4L/DVB (8273): sms1xxx: replace __FUNCTION__ with __func__ 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:20:51 -03:00
Michael Krufky 8544706060 V4L/DVB (8272): sms1xxx: move driver from media/mdtv/ to media/dvb/siano/ 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
 2008-07-20 07:20:47 -03:00