Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330655
b: refs/heads/master
c: 12042b0
h: refs/heads/master
i:
  330653: 3817e3d
  330651: 4cb78dc
  330647: 26c3638
  330639: ca1c8a5
  330623: ba38df3
v: v3
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Aug 4, 2012
1 parent 4127c0e commit 5d34d32
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 24 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: edc7d4483473d71833fd4851ca0dbf8680b43ae1
refs/heads/master: 12042b0593104ba0c0c8030b89c837e9262dc906
22 changes: 18 additions & 4 deletions trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
/* dvb-usb.h is part of the DVB USB library.
/*
* DVB USB framework
*
* Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@desy.de>
* Copyright (C) 2012 Antti Palosaari <crope@iki.fi>
*
* Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
* see dvb-usb-init.c for copyright information.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* the headerfile, all dvb-usb-drivers have to include.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

#ifndef DVB_USB_H
#define DVB_USB_H

Expand Down
23 changes: 18 additions & 5 deletions trunk/drivers/media/dvb/dvb-usb/dvb_usb_common.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
/* dvb-usb-common.h is part of the DVB USB library.
/*
* DVB USB framework
*
* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
* see dvb-usb-init.c for copyright information.
* Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@desy.de>
* Copyright (C) 2012 Antti Palosaari <crope@iki.fi>
*
* a header file containing prototypes and types for internal use of the
* dvb-usb-lib
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

#ifndef DVB_USB_COMMON_H
#define DVB_USB_COMMON_H

Expand Down
27 changes: 18 additions & 9 deletions trunk/drivers/media/dvb/dvb-usb/dvb_usb_core.c
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
/*
* DVB USB library - provides a generic interface for a DVB USB device driver.
* DVB USB framework
*
* dvb-usb-init.c
* Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@desy.de>
* Copyright (C) 2012 Antti Palosaari <crope@iki.fi>
*
* Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* see Documentation/dvb/README.dvb-usb for more information
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

#include "dvb_usb_common.h"

int dvb_usbv2_disable_rc_polling;
Expand Down Expand Up @@ -956,7 +964,8 @@ int dvb_usbv2_resume(struct usb_interface *intf)
}
EXPORT_SYMBOL(dvb_usbv2_resume);

MODULE_VERSION("1.0");
MODULE_VERSION("2.0");
MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
MODULE_DESCRIPTION("A library module containing commonly used USB and DVB function USB DVB devices");
MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
MODULE_DESCRIPTION("DVB USB common");
MODULE_LICENSE("GPL");
23 changes: 18 additions & 5 deletions trunk/drivers/media/dvb/dvb-usb/dvb_usb_urb.c
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
/* dvb-usb-urb.c is part of the DVB USB library.
/*
* DVB USB framework
*
* Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
* see dvb-usb-init.c for copyright information.
* Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@desy.de>
* Copyright (C) 2012 Antti Palosaari <crope@iki.fi>
*
* This file keeps functions for initializing and handling the
* USB and URB stuff.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

#include "dvb_usb_common.h"

#undef DVB_USB_XFER_DEBUG
Expand Down

0 comments on commit 5d34d32

Please sign in to comment.