Merge branch 'from-linus' into upstream (3b38f317) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/dvb/get_dvb_firmware

+4 −4

Original line number	Diff line number	Diff line
		@@ -259,9 +259,9 @@ sub dibusb {
		}

		sub nxt2002 {
		my $sourcefile = "Broadband4PC_4_2_11.zip";
		my $sourcefile = "Technisat_DVB-PC_4_4_COMPACT.zip";
		my $url = "http://www.bbti.us/download/windows/$sourcefile";
		my $hash = "c6d2ea47a8f456d887ada0cfb718ff2a";
		my $hash = "476befae8c7c1bb9648954060b1eec1f";
		my $outfile = "dvb-fe-nxt2002.fw";
		my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);

		@@ -269,8 +269,8 @@ sub nxt2002 {

		wgetfile($sourcefile, $url);
		unzip($sourcefile, $tmpdir);
		verify("$tmpdir/SkyNETU.sys", $hash);
		extract("$tmpdir/SkyNETU.sys", 375832, 5908, $outfile);
		verify("$tmpdir/SkyNET.sys", $hash);
		extract("$tmpdir/SkyNET.sys", 331624, 5908, $outfile);

		$outfile;
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,15 @@ Who: Jody McIntyre <scjody@steamballoon.com>

		---------------------------

		What: sbp2: module parameter "force_inquiry_hack"
		When: July 2006
		Why: Superceded by parameter "workarounds". Both parameters are meant to be
		used ad-hoc and for single devices only, i.e. not in modprobe.conf,
		therefore the impact of this feature replacement should be low.
		Who: Stefan Richter <stefanr@s5r6.in-berlin.de>

		---------------------------

		What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
		When: July 2006
		Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6

+0 −17

Original line number	Diff line number	Diff line
		@@ -105,20 +105,3 @@
		on the setup, so I think that the choice on what firmware to make
		persistent should be left to userspace.

		- Why register_firmware()+__init can be useful:
		- For boot devices needing firmware.
		- To make the transition easier:
		The firmware can be declared __init and register_firmware()
		called on module_init. Then the firmware is warranted to be
		there even if "firmware hotplug userspace" is not there yet or
		it doesn't yet provide the needed firmware.
		Once the firmware is widely available in userspace, it can be
		removed from the kernel. Or made optional (CONFIG_.*_FIRMWARE).

		In either case, if firmware hotplug support is there, it can move the
		firmware out of kernel memory into the real filesystem for later
		usage.

		Note: If persistence is implemented on top of initramfs,
		register_firmware() may not be appropriate.

+0 −11

Original line number	Diff line number	Diff line
		@@ -5,8 +5,6 @@
		*
		* Sample code on how to use request_firmware() from drivers.
		*
		* Note that register_firmware() is currently useless.
		*
		*/

		#include <linux/module.h>
		@@ -17,11 +15,6 @@

		#include "linux/firmware.h"

		#define WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
		#ifdef WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
		char __init inkernel_firmware[] = "let's say that this is firmware\n";
		#endif

		static struct device ghost_device = {
		.bus_id = "ghost0",
		};
		@@ -104,10 +97,6 @@ static void sample_probe_async(void)

		static int sample_init(void)
		{
		#ifdef WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
		register_firmware("sample_driver_fw", inkernel_firmware,
		sizeof(inkernel_firmware));
		#endif
		device_initialize(&ghost_device);
		/* since there is no real hardware insertion I just call the
		* sample probe functions here */

+3 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,9 @@ timeout or margin. The simplest way to ping the watchdog is to write
		some data to the device. So a very simple watchdog daemon would look
		like this:

		#include <stdlib.h>
		#include <fcntl.h>

		int main(int argc, const char *argv[]) {
		int fd=open("/dev/watchdog",O_WRONLY);
		if (fd==-1) {