Skip to contentSkip to conversation

[09051_54] Siano: remove obsolete sms_board_setup

PATCH Uri Shkolnik 1 participant 1 message May 19, 2009 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw
Quoted 209 lines · Michael Krufky

From: Michael Krufky <[email protected]>
Subject: Re: [PATCH] [09051_54] Siano: remove obsolete sms_board_setup
To: "Uri Shkolnik" <[email protected]>
Cc: "linux-media" <[email protected]>, "Mauro Carvalho Chehab" <[email protected]>
Date: Tuesday, May 19, 2009, 8:02 PM

Quoted 4 lines · Uri Shkolnik

--- On Tue, 5/19/09, Michael Krufky <[email protected]>

Quoted 3 lines · wrote:
Quoted 3 lines

From: Michael Krufky <[email protected]>
Subject: Re: [PATCH] [09051_54] Siano: remove

obsolete sms_board_setup

Quoted 2 lines
Quoted 2 lines

To: "Uri Shkolnik" <[email protected]>
Cc: "LinuxML" <[email protected]>,

"Mauro Carvalho Chehab" <[email protected]>

Quoted 9 lines
Quoted 9 lines

Date: Tuesday, May 19, 2009, 7:31 PM

Quoted 5 lines · Uri Shkolnik

# HG changeset patch
# User Uri Shkolnik <[email protected]>
# Date 1242749967 -10800
# Node ID

0296b0c436d6deba48c710cfb510988267cea057

Quoted 1 line
Quoted 1 line
Quoted 1 line

# Parent

 dfcfb90798d3a27cb174019b17fffdee9ce7b2b9

Quoted 1 line
Quoted 1 line
Quoted 1 line

[09051_54] Siano: remove obsolete

sms_board_setup

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

From: Uri Shkolnik <[email protected]>

Remove the target specific sms_board_setup

from

Quoted 2 lines
Quoted 2 lines

smsdvb. This

Quoted 1 line

is handled now via smsdvb and sms-cards

events.

Quoted 8 lines
Quoted 8 lines
Quoted 6 lines

Priority: normal

diff -r dfcfb90798d3 -r 0296b0c436d6

linux/drivers/media/dvb/siano/sms-cards.c

Quoted 1 line

---

a/linux/drivers/media/dvb/siano/sms-cards.c Tue

Quoted 2 lines
Quoted 2 lines
May 19 19:05:02 2009 +0300
Quoted 1 line

+++

b/linux/drivers/media/dvb/siano/sms-cards.c Tue

Quoted 2 lines
Quoted 2 lines
May 19 19:19:27 2009 +0300

Review static int

Quoted 1 line
(quoted diff) +0 -0
@@ -303,28 +303,6 @@ static int

sms_set_gpio(struct

Quoted 2 lines
Quoted 2 lines

smscore_d

Quoted 1 line
(quoted diff) +0 -0
        return smscore_set_gpio(coredev,

gpio,

Quoted 5 lines
Quoted 5 lines

lvl);

Review static int · line 306

Quoted 3 lines
(quoted diff) +0 -1
  }
 
-int sms_board_setup(struct smscore_device_t

*coredev)

Quoted 8 lines
Quoted 8 lines

Review static int · line 308

Quoted 2 lines
(quoted diff) +0 -2
-{
-       int board_id =

smscore_get_board_id(coredev);

Review static int · line 309

Quoted 1 line
(quoted diff) +0 -1
-       struct sms_board *board =

sms_get_board(board_id);

Quoted 3 lines
(quoted diff) +0 -3
-
-       switch (board_id) {
-       case

SMS1XXX_BOARD_HAUPPAUGE_WINDHAM:

Quoted 1 line
Quoted 1 line

Review static int · line 313

Quoted 1 line
(quoted diff) +0 -1
-               /* turn off all LEDs

*/

Quoted 13 lines
Quoted 13 lines

Review static int · line 314

Quoted 1 line
(quoted diff) +0 -1
-               sms_set_gpio(coredev,

board->led_power, 0);

Review static int · line 315

Quoted 1 line
(quoted diff) +0 -1
-               sms_set_gpio(coredev,

board->led_hi, 0);

Review static int · line 316

Quoted 1 line
(quoted diff) +0 -1
-               sms_set_gpio(coredev,

board->led_lo, 0);

Review static int · line 318

Quoted 2 lines
(quoted diff) +0 -2
-               break;
-       case

SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2:

Review static int · line 319

Quoted 1 line
(quoted diff) +0 -1
-       case

SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD:

Quoted 2 lines
(quoted diff) +0 -2
-               /* turn off LNA */
-               sms_set_gpio(coredev,
Quoted 8 lines
Quoted 8 lines

board->lna_ctrl, 0);

Quoted 7 lines
(quoted diff) +0 -6
-               break;
-       }
-       return 0;
-}
-EXPORT_SYMBOL_GPL(sms_board_setup);
-

 int sms_board_power(struct

smscore_device_t

Quoted 7 lines
Quoted 7 lines

*coredev, int onoff)

Quoted 2 lines

 {
       int board_id =

smscore_get_board_id(coredev);

Quoted 1 line

diff -r dfcfb90798d3 -r 0296b0c436d6

linux/drivers/media/dvb/siano/sms-cards.h

Quoted 1 line

---

a/linux/drivers/media/dvb/siano/sms-cards.h Tue

Quoted 2 lines
Quoted 2 lines
May 19 19:05:02 2009 +0300
Quoted 1 line

+++

b/linux/drivers/media/dvb/siano/sms-cards.h Tue

Quoted 2 lines
Quoted 2 lines
May 19 19:19:27 2009 +0300

Review int

Quoted 1 line
(quoted diff) +0 -0
@@ -109,8 +109,6 @@ int

sms_board_event(struct

Quoted 2 lines
Quoted 2 lines

smscore_devic

Quoted 1 line

 int sms_board_event(struct

smscore_device_t

Quoted 2 lines
Quoted 2 lines

*coredev,

Quoted 1 line

               enum SMS_BOARD_EVENTS

gevent);

Quoted 10 lines
Quoted 10 lines
Quoted 2 lines

-int sms_board_setup(struct smscore_device_t

*coredev);

Quoted 5 lines

-
 #define SMS_LED_OFF 0
 #define SMS_LED_LO  1
 #define SMS_LED_HI  2
diff -r dfcfb90798d3 -r 0296b0c436d6

linux/drivers/media/dvb/siano/smsdvb.c

Quoted 1 line

--- a/linux/drivers/media/dvb/siano/smsdvb.c

   Tue

Quoted 2 lines
Quoted 2 lines
May 19 19:05:02 2009 +0300
Quoted 1 line

+++ b/linux/drivers/media/dvb/siano/smsdvb.c

   Tue

Quoted 2 lines
Quoted 2 lines
May 19 19:19:27 2009 +0300

Review static int

Quoted 1 line
(quoted diff) +0 -0
@@ -600,7 +600,6 @@ static int

smsdvb_hotplug(struct

Quoted 22 lines
Quoted 22 lines

smscore

Review static int · line 600

Quoted 1 line
(quoted diff) +0 -0
        sms_board_dvb3_event(client,

DVB3_EVENT_HOTPLUG);

Quoted 11 lines
(quoted diff) +0 -2
        sms_info("success");
-       sms_board_setup(coredev);
 
        return 0;
 
 
 
 
 
--
Quoted 1 line

To unsubscribe from this list: send the line

"unsubscribe linux-media" in

Quoted 3 lines

the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Quoted 4 lines
Quoted 4 lines

NACK.

This changes the behavior of the Hauppauge

devices.

Quoted 2 lines
Quoted 2 lines

Let Uri get all
his other stuff in place first, and THEN we can

look at

Quoted 4 lines
Quoted 4 lines

this
separately.

In addition, this changeset was merged WITHOUT my

ack:

Quoted 2 lines
Quoted 2 lines

http://linuxtv.org/hg/v4l-dvb/rev/37969546eee8 -

Siano:

Quoted 4 lines
Quoted 4 lines

smscards -
assign gpio to HPG targets

That changeset 37969546eee8 alone does not cause

any change

Quoted 2 lines
Quoted 2 lines

in
behavior, but with Uri's patches from today it

will change

Quoted 4 lines
Quoted 4 lines

the
Hauppauge device behavior.

That patch should be reverted and dealt with

separately,

Quoted 9 lines
Quoted 5 lines

after Uri is
finished with his other changes.

-Mike

Mike,

Please note that the Hauppauge device behavior has

been merged to the board_event()  **prior** to this patch.

Quoted 2 lines

I did my best to follow the logic, I might be wrong

(please check).

Quoted 2 lines

This patch is remove *duplicate* led setting, etc...

Uri,

I nack'd that patch as well.  Please don't change the Hauppauge device
behavior -- those changesets break the device functionality.

Quoted 8 lines

Please get all of your core changes in first, then we can look at
device-specifics separately.

Regards,

Mike

Mike all "core" changes are in place. After patch #58, the to-be v4l mercurial tree and the Siano subversion tree are identical regarding the code which we would like to commit.

Regards,

Uri