diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-26 02:04:46 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-26 02:04:46 -0200 |
commit | 37ec66afc95aef6493a0f3617b1f5fff6bbef7cd (patch) | |
tree | a1ce6bf55008043cb777496cd2b120d8335c963c /v4l/scripts | |
parent | b296024463558f0e9fe5dff04fdfd91903f15bd5 (diff) | |
parent | 8d0865f57c653ef13eb27ce8ca78901ba6058d57 (diff) | |
download | mediapointer-dvb-s2-37ec66afc95aef6493a0f3617b1f5fff6bbef7cd.tar.gz mediapointer-dvb-s2-37ec66afc95aef6493a0f3617b1f5fff6bbef7cd.tar.bz2 |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb-fixes
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l/scripts')
-rwxr-xr-x | v4l/scripts/em28xx.pl | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/v4l/scripts/em28xx.pl b/v4l/scripts/em28xx.pl index 278dfc214..9a97def2a 100755 --- a/v4l/scripts/em28xx.pl +++ b/v4l/scripts/em28xx.pl @@ -8,11 +8,7 @@ my %data; while (<>) { # defines in header file - if (/#define\s+(EM2820_BOARD_\w+)\s+(\d+)/) { - $data{$1}->{nr} = $2; - next; - } - if (/#define\s+(EM2800_BOARD_\w+)\s+(\d+)/) { + if (/#define\s+(EM28[\d]._BOARD_\w+)\s+(\d+)/) { $data{$1}->{nr} = $2; next; } @@ -22,11 +18,10 @@ while (<>) { $data{$id}->{id} = $id; $data{$id}->{type} = "(em2820/em2840)"; # $data{$id}->{nr} = $nr++; - }; - if (/\[(EM2800_BOARD_\w+)\]/) { - $id = $1; + } elsif (/\[(EM)(28[\d].)(_BOARD_\w+)\]/) { + $id = "$1$2$3"; $data{$id}->{id} = $id; - $data{$id}->{type} = "(em2800)"; + $data{$id}->{type} = "(em$2)"; # $data{$id}->{nr} = $nr++; }; |