git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core/xen' into x86/xen
[safe/jmp/linux-2.6]
/
drivers
/
media
/
dvb
/
siano
/
smscoreapi.h
diff --git
a/drivers/media/dvb/siano/smscoreapi.h
b/drivers/media/dvb/siano/smscoreapi.h
index
eb0ed65
..
8d973f7
100644
(file)
--- a/
drivers/media/dvb/siano/smscoreapi.h
+++ b/
drivers/media/dvb/siano/smscoreapi.h
@@
-6,7
+6,7
@@
* Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
*
* This program is free software; you can redistribute it and/or modify
* Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
*
* 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
+ * it under the terms of the GNU General Public License version
2
as
* published by the Free Software Foundation;
*
* Software distributed under the License is distributed on an "AS IS"
* published by the Free Software Foundation;
*
* Software distributed under the License is distributed on an "AS IS"
@@
-26,7
+26,8
@@
#include <linux/device.h>
#include <linux/list.h>
#include <linux/mm.h>
#include <linux/device.h>
#include <linux/list.h>
#include <linux/mm.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
+#include <linux/types.h>
#include <asm/page.h>
#include "dmxdev.h"
#include <asm/page.h>
#include "dmxdev.h"
@@
-36,8
+37,6
@@
#include <linux/mutex.h>
#include <linux/mutex.h>
-typedef struct mutex kmutex_t;
-
#define kmutex_init(_p_) mutex_init(_p_)
#define kmutex_lock(_p_) mutex_lock(_p_)
#define kmutex_trylock(_p_) mutex_trylock(_p_)
#define kmutex_init(_p_) mutex_init(_p_)
#define kmutex_lock(_p_) mutex_lock(_p_)
#define kmutex_trylock(_p_) mutex_trylock(_p_)
@@
-50,7
+49,7
@@
typedef struct mutex kmutex_t;
#define SMS_ALLOC_ALIGNMENT 128
#define SMS_DMA_ALIGNMENT 16
#define SMS_ALIGN_ADDRESS(addr) \
#define SMS_ALLOC_ALIGNMENT 128
#define SMS_DMA_ALIGNMENT 16
#define SMS_ALIGN_ADDRESS(addr) \
- ((((u
32
)(addr)) + (SMS_DMA_ALIGNMENT-1)) & ~(SMS_DMA_ALIGNMENT-1))
+ ((((u
intptr_t
)(addr)) + (SMS_DMA_ALIGNMENT-1)) & ~(SMS_DMA_ALIGNMENT-1))
#define SMS_DEVICE_FAMILY2 1
#define SMS_ROM_NO_RESPONSE 2
#define SMS_DEVICE_FAMILY2 1
#define SMS_ROM_NO_RESPONSE 2
@@
-378,10
+377,6
@@
extern int smscore_load_firmware(struct smscore_device_t *coredev,
char *filename,
loadfirmware_t loadfirmware_handler);
char *filename,
loadfirmware_t loadfirmware_handler);
-extern int smscore_load_firmware_from_buffer(struct smscore_device_t *coredev,
- u8 *buffer, int size,
- int new_mode);
-
extern int smscore_set_device_mode(struct smscore_device_t *coredev, int mode);
extern int smscore_get_device_mode(struct smscore_device_t *coredev);
extern int smscore_set_device_mode(struct smscore_device_t *coredev, int mode);
extern int smscore_get_device_mode(struct smscore_device_t *coredev);
@@
-395,11
+390,9
@@
extern int smsclient_sendrequest(struct smscore_client_t *client,
extern void smscore_onresponse(struct smscore_device_t *coredev,
struct smscore_buffer_t *cb);
extern void smscore_onresponse(struct smscore_device_t *coredev,
struct smscore_buffer_t *cb);
-extern int smscore_get_common_buffer_size(struct smscore_device_t *coredev);
-extern int smscore_map_common_buffer(struct smscore_device_t *coredev,
- struct vm_area_struct *vma);
-extern struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev);
+extern
+struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev);
extern void smscore_putbuffer(struct smscore_device_t *coredev,
struct smscore_buffer_t *cb);
extern void smscore_putbuffer(struct smscore_device_t *coredev,
struct smscore_buffer_t *cb);
@@
-428,10
+421,10
@@
extern int sms_debug;
if (sms_debug & lvl) \
sms_printk(kern, fmt, ##arg); } while (0)
if (sms_debug & lvl) \
sms_printk(kern, fmt, ##arg); } while (0)
+#define sms_log(fmt, arg...) sms_printk(KERN_INFO, fmt, ##arg)
#define sms_err(fmt, arg...) \
sms_printk(KERN_ERR, "line: %d: " fmt, __LINE__, ##arg)
#define sms_err(fmt, arg...) \
sms_printk(KERN_ERR, "line: %d: " fmt, __LINE__, ##arg)
-#define sms_warn(fmt, arg...) \
- sms_printk(KERN_WARNING, "line: %d: " fmt, __LINE__, ##arg)
+#define sms_warn(fmt, arg...) sms_printk(KERN_WARNING, fmt, ##arg)
#define sms_info(fmt, arg...) \
dprintk(KERN_INFO, DBG_INFO, fmt, ##arg)
#define sms_debug(fmt, arg...) \
#define sms_info(fmt, arg...) \
dprintk(KERN_INFO, DBG_INFO, fmt, ##arg)
#define sms_debug(fmt, arg...) \