Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c11d546 authored Jun 18, 2008 by Michael Krufky Committed by Mauro Carvalho Chehab Jul 20, 2008

V4L/DVB (8292): sms1xxx: add code to allow device-specific functionality



Set board ID in the usb_device_id table's driver_info field.
Use board name when registering the dvb adapter.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

parent dd5b2a5c

drivers/media/dvb/siano/Makefile

+1 −1

Original line number	Diff line number	Diff line
		sms1xxx-objs := smscoreapi.o smsusb.o smsdvb.o
		sms1xxx-objs := smscoreapi.o smsusb.o smsdvb.o sms-cards.o

		obj-$(CONFIG_DVB_SIANO_SMS1XXX) += sms1xxx.o

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

0 → 100644

+69 −0

Original line number	Diff line number	Diff line
		/*
		* Card-specific functions for the Siano SMS1xxx USB dongle
		*
		* Copyright (c) 2008 Michael Krufky <mkrufky@linuxtv.org>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 3 as
		* published by the Free Software Foundation;
		*
		* Software distributed under the License is distributed on an "AS IS"
		* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
		*
		* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
		*/

		#include "sms-cards.h"

		struct usb_device_id smsusb_id_table[] = {
		{ USB_DEVICE(0x187f, 0x0010),
		.driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
		{ USB_DEVICE(0x187f, 0x0100),
		.driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
		{ USB_DEVICE(0x187f, 0x0200),
		.driver_info = SMS1XXX_BOARD_SIANO_NOVA_A },
		{ USB_DEVICE(0x187f, 0x0201),
		.driver_info = SMS1XXX_BOARD_SIANO_NOVA_B },
		{ USB_DEVICE(0x187f, 0x0300),
		.driver_info = SMS1XXX_BOARD_SIANO_VEGA },
		{ } /* Terminating entry */
		};
		MODULE_DEVICE_TABLE(usb, smsusb_id_table);

		static struct sms_board sms_boards[] = {
		[SMS_BOARD_UNKNOWN] = {
		.name = "Unknown board",
		},
		[SMS1XXX_BOARD_SIANO_SMS1000] = {
		.name = "Siano Digital Receiver",
		.type = SMS_STELLAR,
		},
		[SMS1XXX_BOARD_SIANO_STELLAR] = {
		.name = "Siano Stellar reference board",
		.type = SMS_STELLAR,
		},
		[SMS1XXX_BOARD_SIANO_NOVA_A] = {
		.name = "Siano Nova A reference board",
		.type = SMS_NOVA_A0,
		},
		[SMS1XXX_BOARD_SIANO_NOVA_B] = {
		.name = "Siano Nova B reference board",
		.type = SMS_NOVA_B0,
		},
		[SMS1XXX_BOARD_SIANO_VEGA] = {
		.name = "Siano Vega reference board",
		.type = SMS_VEGA,
		},
		};

		struct sms_board *sms_get_board(int id)
		{
		BUG_ON(id >= ARRAY_SIZE(sms_boards));

		return &sms_boards[id];
		}

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

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		/*
		* Card-specific functions for the Siano SMS1xxx USB dongle
		*
		* Copyright (c) 2008 Michael Krufky <mkrufky@linuxtv.org>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 3 as
		* published by the Free Software Foundation;
		*
		* Software distributed under the License is distributed on an "AS IS"
		* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
		*
		* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
		*/

		#ifndef __SMS_CARDS_H__
		#define __SMS_CARDS_H__

		#include <linux/usb.h>
		#include "smscoreapi.h"

		#define SMS_BOARD_UNKNOWN 0
		#define SMS1XXX_BOARD_SIANO_SMS1000 1
		#define SMS1XXX_BOARD_SIANO_STELLAR 2
		#define SMS1XXX_BOARD_SIANO_NOVA_A 3
		#define SMS1XXX_BOARD_SIANO_NOVA_B 4
		#define SMS1XXX_BOARD_SIANO_VEGA 5

		struct sms_board {
		char *name;
		enum sms_device_type_st type;
		};

		struct sms_board *sms_get_board(int id);

		extern struct usb_device_id smsusb_id_table[];

		#endif /* __SMS_CARDS_H__ */

drivers/media/dvb/siano/smscoreapi.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -101,8 +101,20 @@ struct smscore_device_t {

		struct completion version_ex_done, data_download_done, trigger_done;
		struct completion init_device_done, reload_start_done, resume_done;

		int board_id;
		};

		void smscore_set_board_id(struct smscore_device_t *core, int id)
		{
		core->board_id = id;
		}

		int smscore_get_board_id(struct smscore_device_t *core)
		{
		return core->board_id;
		}

		struct smscore_registry_entry_t {
		struct list_head entry;
		char devpath[32];

drivers/media/dvb/siano/smscoreapi.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -403,6 +403,9 @@ extern struct smscore_buffer_t smscore_getbuffer(struct smscore_device_t cored
		extern void smscore_putbuffer(struct smscore_device_t *coredev,
		struct smscore_buffer_t *cb);

		void smscore_set_board_id(struct smscore_device_t *core, int id);
		int smscore_get_board_id(struct smscore_device_t *core);

		/* smsdvb.c */
		int smsdvb_register(void);
		void smsdvb_unregister(void);