diff options
author | Uri Shkolnik <uris@siano-ms.com> | 2008-08-30 23:44:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:00 -0400 |
commit | e0f14c2574ded46b9ec8a1518922d07bc4001c18 (patch) | |
tree | 343c600948612f869dab3c0fb1ccf58bd6c3a3d7 /drivers/media/dvb/siano/smsdvb.c | |
parent | 841a3f0de9a55682d33aa8bf770ff4f7cbb7e5da (diff) |
V4L/DVB (10750): import changes from Siano
Import the following changes from Uri Shkolnik
* Two-ways merge with Siano internal repository
* Continuing with DVB sub-system separation
* kconfig and makefile updates
* Code cleanup
This is a work-in-progress sync with Siano's internal repository.
Some changes had to be altered or dropped in order not to break the build.
This breaks normal operation for the current driver, but it is being committed
now for tracking purposes.
These changes introduce the following checkpatch.pl violations:
ERROR: do not use C99 // comments
156: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1373:
+//#ifdef DVB_CORE
ERROR: do not use C99 // comments
157: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1374:
+// smsdvb_unregister();
ERROR: do not use C99 // comments
158: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1375:
+//#endif
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
163: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1380:
+EXPORT_SYMBOL(smscore_onresponse);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
164: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1381:
+EXPORT_SYMBOL(sms_get_board);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
165: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1382:
+EXPORT_SYMBOL(sms_debug);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
166: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1383:
+EXPORT_SYMBOL(smscore_putbuffer);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
167: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1384:
+EXPORT_SYMBOL(smscore_registry_getmode);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
168: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1385:
+EXPORT_SYMBOL(smscore_register_device);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
169: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1386:
+EXPORT_SYMBOL(smscore_set_board_id);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
170: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1387:
+EXPORT_SYMBOL(smscore_start_device);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
171: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1388:
+EXPORT_SYMBOL(smsusb_id_table);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
172: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1389:
+EXPORT_SYMBOL(smscore_unregister_device);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
173: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1390:
+EXPORT_SYMBOL(smscore_getbuffer);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
174: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1391:
+EXPORT_SYMBOL(smscore_get_device_mode);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
175: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1392:
+EXPORT_SYMBOL(smscore_register_client);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
176: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1393:
+EXPORT_SYMBOL(smscore_unregister_hotplug);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
177: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1394:
+EXPORT_SYMBOL(smsclient_sendrequest);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
178: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1395:
+EXPORT_SYMBOL(smscore_unregister_client);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
179: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1396:
+EXPORT_SYMBOL(smscore_get_board_id);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
180: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1397:
+EXPORT_SYMBOL(smscore_register_hotplug);
WARNING: line over 80 characters
391: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:398:
+extern int smscore_get_fw_filename(struct smscore_device_t *coredev, int mode, char* filename);
ERROR: "foo* bar" should be "foo *bar"
391: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:398:
+extern int smscore_get_fw_filename(struct smscore_device_t *coredev, int mode, char* filename);
WARNING: line over 80 characters
392: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:399:
+extern int smscore_send_fw_file(struct smscore_device_t *coredev, u8* ufwbuf,int size);
ERROR: "foo* bar" should be "foo *bar"
392: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:399:
+extern int smscore_send_fw_file(struct smscore_device_t *coredev, u8* ufwbuf,int size);
ERROR: space required after that ',' (ctx:VxV)
392: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:399:
+extern int smscore_send_fw_file(struct smscore_device_t *coredev, u8* ufwbuf,int size);
^
WARNING: __func__ should be used instead of gcc specific __FUNCTION__
489: FILE: linux/drivers/media/dvb/siano/smsusb.c:443:
+ printk(KERN_INFO"%s Entering status %d.\n", __FUNCTION__, msg.event);
WARNING: __func__ should be used instead of gcc specific __FUNCTION__
501: FILE: linux/drivers/media/dvb/siano/smsusb.c:455:
+ printk(KERN_INFO "%s Entering.\n", __FUNCTION__);
ERROR: space prohibited before that '++' (ctx:WxB)
505: FILE: linux/drivers/media/dvb/siano/smsusb.c:459:
+ for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i ++)
^
WARNING: __func__ should be used instead of gcc specific __FUNCTION__
517: FILE: linux/drivers/media/dvb/siano/smsusb.c:471:
+ __FUNCTION__, rc);
total: 7 errors, 23 warnings, 524 lines checked
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>
Diffstat (limited to 'drivers/media/dvb/siano/smsdvb.c')
-rw-r--r-- | drivers/media/dvb/siano/smsdvb.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c index 28e904890016..36dc9f2d1172 100644 --- a/drivers/media/dvb/siano/smsdvb.c +++ b/drivers/media/dvb/siano/smsdvb.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Driver for the Siano SMS1xxx USB dongle | 2 | * Driver for the Siano SMS1xxx USB dongle |
3 | * | 3 | * |
4 | * author: Anatoly Greenblat | 4 | * Author: Uri Shkolni |
5 | * | 5 | * |
6 | * Copyright (c), 2005-2008 Siano Mobile Silicon, Inc. | 6 | * Copyright (c), 2005-2008 Siano Mobile Silicon, Inc. |
7 | * | 7 | * |
@@ -368,7 +368,7 @@ static void smsdvb_release(struct dvb_frontend *fe) | |||
368 | 368 | ||
369 | static struct dvb_frontend_ops smsdvb_fe_ops = { | 369 | static struct dvb_frontend_ops smsdvb_fe_ops = { |
370 | .info = { | 370 | .info = { |
371 | .name = "Siano Mobile Digital SMS1xxx", | 371 | .name = "Siano Mobile Digital MDTV Receiver", |
372 | .type = FE_OFDM, | 372 | .type = FE_OFDM, |
373 | .frequency_min = 44250000, | 373 | .frequency_min = 44250000, |
374 | .frequency_max = 867250000, | 374 | .frequency_max = 867250000, |
@@ -410,7 +410,7 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev, | |||
410 | if (!arrival) | 410 | if (!arrival) |
411 | return 0; | 411 | return 0; |
412 | 412 | ||
413 | if (smscore_get_device_mode(coredev) != 4) { | 413 | if (smscore_get_device_mode(coredev) != DEVICE_MODE_DVBT_BDA) { |
414 | sms_err("SMS Device mode is not set for " | 414 | sms_err("SMS Device mode is not set for " |
415 | "DVB operation."); | 415 | "DVB operation."); |
416 | return 0; | 416 | return 0; |
@@ -512,7 +512,7 @@ adapter_error: | |||
512 | return rc; | 512 | return rc; |
513 | } | 513 | } |
514 | 514 | ||
515 | int smsdvb_register(void) | 515 | int smsdvb_module_init(void) |
516 | { | 516 | { |
517 | int rc; | 517 | int rc; |
518 | 518 | ||
@@ -526,7 +526,7 @@ int smsdvb_register(void) | |||
526 | return rc; | 526 | return rc; |
527 | } | 527 | } |
528 | 528 | ||
529 | void smsdvb_unregister(void) | 529 | void smsdvb_module_exit(void) |
530 | { | 530 | { |
531 | smscore_unregister_hotplug(smsdvb_hotplug); | 531 | smscore_unregister_hotplug(smsdvb_hotplug); |
532 | 532 | ||
@@ -538,3 +538,10 @@ void smsdvb_unregister(void) | |||
538 | 538 | ||
539 | kmutex_unlock(&g_smsdvb_clientslock); | 539 | kmutex_unlock(&g_smsdvb_clientslock); |
540 | } | 540 | } |
541 | |||
542 | module_init(smsdvb_module_init); | ||
543 | module_exit(smsdvb_module_exit); | ||
544 | |||
545 | MODULE_DESCRIPTION("SMS DVB subsystem adaptation module"); | ||
546 | MODULE_AUTHOR("Siano Mobile Silicon, INC. (uris@siano-ms.com)"); | ||
547 | MODULE_LICENSE("GPL"); | ||