The patch number 8282 was added via Michael Krufky <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Michael Krufky <[EMAIL PROTECTED]>
sms1xxx: more codingstyle cleanups
Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/siano/smscoreapi.c | 36 ++++++++----------
linux/drivers/media/dvb/siano/smscoreapi.h | 4 +-
linux/drivers/media/dvb/siano/smsdvb.c | 40 +++++++++------------
linux/drivers/media/dvb/siano/smsusb.c | 18 ++++-----
4 files changed, 47 insertions(+), 51 deletions(-)
diff -r 8566f18eca04 -r d8ac99b96220 linux/drivers/media/dvb/siano/smscoreapi.c
--- a/linux/drivers/media/dvb/siano/smscoreapi.c Sun Jun 15 11:32:00
2008 -0400
+++ b/linux/drivers/media/dvb/siano/smscoreapi.c Sun Jun 15 11:52:43
2008 -0400
@@ -434,7 +434,7 @@ int smscore_register_device(smsdevice_pa
/* prepare dma buffers */
for (buffer = dev->common_buffer;
dev->num_buffers < params->num_buffers;
- dev->num_buffers ++, buffer += params->buffer_size) {
+ dev->num_buffers++, buffer += params->buffer_size) {
smscore_buffer_t *cb = smscore_createbuffer(buffer,
dev->common_buffer, dev->common_buffer_phys);
if (!cb) {
smscore_unregister_device(dev);
@@ -547,8 +547,7 @@ int smscore_load_firmware_family2(smscor
mem_address = *(u32 *) &payload[20];
}
- while (size && rc >= 0)
- {
+ while (size && rc >= 0) {
SmsDataDownload_ST *DataMsg = (SmsDataDownload_ST *) msg;
int payload_size = min((int) size, SMS_MAX_PAYLOAD_SIZE);
@@ -578,11 +577,11 @@ int smscore_load_firmware_family2(smscor
sizeof(SmsMsgHdr_ST) +
sizeof(u32) * 5);
- TriggerMsg->msgData[0] = firmware->StartAddress;
// Entry point
- TriggerMsg->msgData[1] = 5;
// Priority
- TriggerMsg->msgData[2] = 0x200;
// Stack size
- TriggerMsg->msgData[3] = 0;
// Parameter
- TriggerMsg->msgData[4] = 4;
// Task ID
+ TriggerMsg->msgData[0] = firmware->StartAddress; /*
Entry point */
+ TriggerMsg->msgData[1] = 5; /* Priority */
+ TriggerMsg->msgData[2] = 0x200; /* Stack size */
+ TriggerMsg->msgData[3] = 0; /* Parameter */
+ TriggerMsg->msgData[4] = 4; /* Task ID */
if (coredev->device_flags & SMS_ROM_NO_RESPONSE) {
rc =
coredev->sendrequest_handler(coredev->context, TriggerMsg,
TriggerMsg->xMsgHeader.msgLength);
@@ -692,7 +691,7 @@ void smscore_unregister_device(smscore_d
while (1) {
while ((cb = smscore_getbuffer(coredev))) {
kfree(cb);
- num_buffers ++;
+ num_buffers++;
}
if (num_buffers == coredev->num_buffers)
break;
@@ -892,14 +891,14 @@ smscore_client_t *smscore_find_client(sm
for (next = first->next;
(next != first) && !client;
next = next->next) {
- firstid = &((smscore_client_t*)next)->idlist;
+ firstid = &((smscore_client_t *)next)->idlist;
for (nextid = firstid->next;
nextid != firstid;
nextid = nextid->next) {
- if ((((smscore_idlist_t*)nextid)->id == id) &&
- (((smscore_idlist_t*)nextid)->data_type ==
data_type ||
- (((smscore_idlist_t*)nextid)->data_type == 0))) {
- client = (smscore_client_t*) next;
+ if ((((smscore_idlist_t *)nextid)->id == id) &&
+ (((smscore_idlist_t *)nextid)->data_type ==
data_type ||
+ (((smscore_idlist_t *)nextid)->data_type == 0))) {
+ client = (smscore_client_t *) next;
break;
}
}
@@ -931,8 +930,7 @@ void smscore_onresponse(smscore_device_t
if (!last_sample_time)
last_sample_time = time_now;
- if (time_now - last_sample_time > 10000)
- {
+ if (time_now - last_sample_time > 10000) {
printk("\n%s data rate %d bytes/secs\n", __func__,
(int)((data_total * 1000) /
(time_now - last_sample_time)));
@@ -1050,9 +1048,9 @@ int smscore_validate_client(smscore_devi
return -EFAULT;
}
registered_client = smscore_find_client(coredev, data_type, id);
- if (registered_client == client) {
+ if (registered_client == client)
return 0;
- }
+
if (registered_client) {
PERROR("The msg ID already registered to another client.\n");
return -EEXIST;
@@ -1130,7 +1128,7 @@ void smscore_unregister_client(smscore_c
while (!list_empty(&client->idlist)) {
smscore_idlist_t *identry =
- (smscore_idlist_t*) client->idlist.next;
+ (smscore_idlist_t *) client->idlist.next;
list_del(&identry->entry);
kfree(identry);
}
diff -r 8566f18eca04 -r d8ac99b96220 linux/drivers/media/dvb/siano/smscoreapi.h
--- a/linux/drivers/media/dvb/siano/smscoreapi.h Sun Jun 15 11:32:00
2008 -0400
+++ b/linux/drivers/media/dvb/siano/smscoreapi.h Sun Jun 15 11:52:43
2008 -0400
@@ -60,7 +60,7 @@ void *kzalloc(size_t size, int flags);
#endif /* LINUX_VERSION */
#ifndef min
-#define min(a,b) (((a) < (b)) ? (a) : (b))
+#define min(a, b) (((a) < (b)) ? (a) : (b))
#endif
#define SMS_ALLOC_ALIGNMENT 128
@@ -72,7 +72,7 @@ void *kzalloc(size_t size, int flags);
#define SMS_DEVICE_NOT_READY 0x8000000
typedef enum {
- SMS_STELLAR= 0,
+ SMS_STELLAR = 0,
SMS_NOVA_A0,
SMS_NOVA_B0,
SMS_VEGA,
diff -r 8566f18eca04 -r d8ac99b96220 linux/drivers/media/dvb/siano/smsdvb.c
--- a/linux/drivers/media/dvb/siano/smsdvb.c Sun Jun 15 11:32:00 2008 -0400
+++ b/linux/drivers/media/dvb/siano/smsdvb.c Sun Jun 15 11:52:43 2008 -0400
@@ -34,7 +34,7 @@ int smsdvb_onresponse(void *context, sms
smsdvb_client_t *client = (smsdvb_client_t *) context;
SmsMsgHdr_ST *phdr = (SmsMsgHdr_ST *)(((u8 *) cb->p) + cb->offset);
- switch(phdr->msgType) {
+ switch (phdr->msgType) {
case MSG_SMS_DVBT_BDA_DATA:
dvb_dmx_swfilter(&client->demux, (u8 *)(phdr + 1),
cb->size - sizeof(SmsMsgHdr_ST));
@@ -49,8 +49,7 @@ int smsdvb_onresponse(void *context, sms
SmsMsgStatisticsInfo_ST *p =
(SmsMsgStatisticsInfo_ST *)(phdr + 1);
- if (p->Stat.IsDemodLocked)
- {
+ if (p->Stat.IsDemodLocked) {
client->fe_status = FE_HAS_SIGNAL |
FE_HAS_CARRIER |
FE_HAS_VITERBI |
@@ -85,7 +84,7 @@ int smsdvb_onresponse(void *context, sms
void smsdvb_unregister_client(smsdvb_client_t *client)
{
- // must be called under clientslock
+ /* must be called under clientslock */
list_del(&client->entry);
@@ -243,16 +242,15 @@ static int smsdvb_set_frontend(struct dv
printk("%s freq %d band %d\n", __func__,
fep->frequency, fep->u.ofdm.bandwidth);
- switch(fep->u.ofdm.bandwidth)
- {
- case BANDWIDTH_8_MHZ: Msg.Data[1] = BW_8_MHZ; break;
- case BANDWIDTH_7_MHZ: Msg.Data[1] = BW_7_MHZ; break;
- case BANDWIDTH_6_MHZ: Msg.Data[1] = BW_6_MHZ; break;
+ switch (fep->u.ofdm.bandwidth) {
+ case BANDWIDTH_8_MHZ: Msg.Data[1] = BW_8_MHZ; break;
+ case BANDWIDTH_7_MHZ: Msg.Data[1] = BW_7_MHZ; break;
+ case BANDWIDTH_6_MHZ: Msg.Data[1] = BW_6_MHZ; break;
#if 0
- case BANDWIDTH_5_MHZ: Msg.Data[1] = BW_5_MHZ; break;
+ case BANDWIDTH_5_MHZ: Msg.Data[1] = BW_5_MHZ; break;
#endif
- case BANDWIDTH_AUTO: return -EOPNOTSUPP;
- default: return -EINVAL;
+ case BANDWIDTH_AUTO: return -EOPNOTSUPP;
+ default: return -EINVAL;
}
return smsdvb_sendrequest_and_wait(client, &Msg, sizeof(Msg),
@@ -266,7 +264,7 @@ static int smsdvb_get_frontend(struct dv
printk("%s\n", __func__);
- // todo:
+ /* todo: */
memcpy(fep, &client->fe_params,
sizeof(struct dvb_frontend_parameters));
return 0;
@@ -274,7 +272,7 @@ static int smsdvb_get_frontend(struct dv
static void smsdvb_release(struct dvb_frontend *fe)
{
- // do nothing
+ /* do nothing */
}
static struct dvb_frontend_ops smsdvb_fe_ops = {
@@ -313,12 +311,12 @@ int smsdvb_hotplug(smscore_device_t *cor
smsdvb_client_t *client;
int rc;
- // device removal handled by onremove callback
+ /* device removal handled by onremove callback */
if (!arrival)
return 0;
if (smscore_get_device_mode(coredev) != 4) {
-#if 1 // new siano drop (1.2.17) does this -- yuck
+#if 1 /* new siano drop (1.2.17) does this -- yuck */
printk(KERN_ERR "%sSMS Device mode is not set for DVB
operation.\n", __func__);
return 0;
#else
@@ -334,7 +332,7 @@ int smsdvb_hotplug(smscore_device_t *cor
return -ENOMEM;
}
- // register dvb adapter
+ /* register dvb adapter */
rc = dvb_register_adapter(&client->adapter, "Siano Digital Receiver",
THIS_MODULE, device, adapter_nr);
if (rc < 0) {
@@ -342,9 +340,9 @@ int smsdvb_hotplug(smscore_device_t *cor
goto adapter_error;
}
- // init dvb demux
+ /* init dvb demux */
client->demux.dmx.capabilities = DMX_TS_FILTERING;
- client->demux.filternum = 32; // todo: nova ???
+ client->demux.filternum = 32; /* todo: nova ??? */
client->demux.feednum = 32;
client->demux.start_feed = smsdvb_start_feed;
client->demux.stop_feed = smsdvb_stop_feed;
@@ -355,7 +353,7 @@ int smsdvb_hotplug(smscore_device_t *cor
goto dvbdmx_error;
}
- // init dmxdev
+ /* init dmxdev */
client->dmxdev.filternum = 32;
client->dmxdev.demux = &client->demux.dmx;
client->dmxdev.capabilities = 0;
@@ -366,7 +364,7 @@ int smsdvb_hotplug(smscore_device_t *cor
goto dmxdev_error;
}
- // init and register frontend
+ /* init and register frontend */
memcpy(&client->frontend.ops, &smsdvb_fe_ops,
sizeof(struct dvb_frontend_ops));
diff -r 8566f18eca04 -r d8ac99b96220 linux/drivers/media/dvb/siano/smsusb.c
--- a/linux/drivers/media/dvb/siano/smsusb.c Sun Jun 15 11:32:00 2008 -0400
+++ b/linux/drivers/media/dvb/siano/smsusb.c Sun Jun 15 11:52:43 2008 -0400
@@ -153,7 +153,7 @@ void smsusb_stop_streaming(smsusb_device
{
int i;
- for (i = 0; i < MAX_URBS; i ++) {
+ for (i = 0; i < MAX_URBS; i++) {
usb_kill_urb(&dev->surbs[i].urb);
if (dev->surbs[i].cb) {
@@ -167,7 +167,7 @@ int smsusb_start_streaming(smsusb_device
{
int i, rc;
- for (i = 0; i < MAX_URBS; i ++) {
+ for (i = 0; i < MAX_URBS; i++) {
rc = smsusb_submit_urb(dev, &dev->surbs[i]);
if (rc < 0) {
printk(KERN_INFO "%s smsusb_submit_urb(...) "
@@ -279,7 +279,7 @@ void smsusb_term_device(struct usb_inter
if (dev) {
smsusb_stop_streaming(dev);
- // unregister from smscore
+ /* unregister from smscore */
if (dev->coredev)
smscore_unregister_device(dev->coredev);
@@ -297,7 +297,7 @@ int smsusb_init_device(struct usb_interf
smsusb_device_t *dev;
int i, rc;
- // create device object
+ /* create device object */
dev = kzalloc(sizeof(smsusb_device_t), GFP_KERNEL);
if (!dev) {
printk(KERN_INFO "%s kzalloc(sizeof(smsusb_device_t) failed\n",
@@ -317,13 +317,13 @@ int smsusb_init_device(struct usb_interf
params.setmode_handler = smsusb1_setmode;
params.detectmode_handler = smsusb1_detectmode;
params.device_type = SMS_STELLAR;
- printk(KERN_INFO "%s stellar device found\n", __func__ );
+ printk(KERN_INFO "%s stellar device found\n", __func__);
break;
default:
switch (dev->udev->descriptor.idProduct) {
case USB_PID_NOVA_A:
params.device_type = SMS_NOVA_A0;
- printk(KERN_INFO "%s nova A0 found\n", __func__ );
+ printk(KERN_INFO "%s nova A0 found\n", __func__);
break;
default:
case USB_PID_NOVA_B:
@@ -361,7 +361,7 @@ int smsusb_init_device(struct usb_interf
return rc;
}
- // initialize urbs
+ /* initialize urbs */
for (i = 0; i < MAX_URBS; i++) {
dev->surbs[i].dev = dev;
usb_init_urb(&dev->surbs[i].urb);
@@ -409,7 +409,7 @@ int smsusb_probe(struct usb_interface *i
printk(KERN_INFO "smsusb_probe %d\n",
intf->cur_altsetting->desc.bInterfaceNumber);
- for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i ++)
+ for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i++)
printk(KERN_INFO "endpoint %d %02x %02x %d\n", i,
intf->cur_altsetting->endpoint[i].desc.bEndpointAddress,
intf->cur_altsetting->endpoint[i].desc.bmAttributes,
@@ -444,7 +444,7 @@ static struct usb_device_id smsusb_id_ta
{ USB_DEVICE(USB_VID_SIANO, USB_PID_NOVA_A) },
{ } /* Terminating entry */
};
-MODULE_DEVICE_TABLE (usb, smsusb_id_table);
+MODULE_DEVICE_TABLE(usb, smsusb_id_table);
static struct usb_driver smsusb_driver = {
.name = "smsusb",
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d8ac99b96220db3cccb621f046bf6697550e268a
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
