From 501ef6658daeab8c5ecf5ce7bb3b5aba986c5477 Mon Sep 17 00:00:00 2001 From: ben Date: Mon, 9 Jul 2007 16:29:32 +0000 Subject: [PATCH] fix some incompatible pointers git-svn-id: svn+ssh://en.codiert.org/home/staff/ben/dev/misc.svn/projects/fpgafs@358 766a2236-cff9-0310-b0c0-a81a5f92509a --- fpgafs.h | 12 +++++------- fpgafs_lldrv_cham.c | 2 +- fpgafs_lldrv_dbg.c | 4 ++-- llmgmt.c | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/fpgafs.h b/fpgafs.h index 938a681..1d5e4d5 100644 --- a/fpgafs.h +++ b/fpgafs.h @@ -40,20 +40,18 @@ struct fpgafs_lldrv { int (*init) (void); int (*exit) (void); - int (*send) (unsigned char *buf, int len); + int (*send) (const char __user *buf, int len); int (*recv) (unsigned char *buf, int len); - int (*read_load) (unsigned char *buf, int len); - int (*write_load) (unsigned char *buf, int len); + int (*read_load) (unsigned char *buf, int len); + int (*write_load) (const char __user *buf, int len); }; int fpgafs_register_lldrv(struct fpgafs_lldrv *drv); int fpgafs_unregister_lldrv(struct fpgafs_lldrv *drv); -static ssize_t fpgafs_send_data(struct file *file, char __user *buf, - size_t len, loff_t *pos); -static ssize_t fpgafs_recv_data(struct file *file, char __user *buf, - size_t len, loff_t *pos); +ssize_t fpgafs_send_data(struct file *file, const char __user *buf, size_t len, loff_t *pos); +ssize_t fpgafs_recv_data(struct file *file, char __user *buf, size_t len, loff_t *pos); int fpgafs_read_load(char *buf, int len); int fpgafs_write_load(char *buf, int len); diff --git a/fpgafs_lldrv_cham.c b/fpgafs_lldrv_cham.c index 49a8dcd..3327170 100644 --- a/fpgafs_lldrv_cham.c +++ b/fpgafs_lldrv_cham.c @@ -6,7 +6,7 @@ #include #include "fpgafs.h" -static int fpgafs_send_data_cham(unsigned char *buf, int len) +static int fpgafs_send_data_cham(const char __user *buf, int len) { printk("fpgafs: send data CHAM\n"); return 0; diff --git a/fpgafs_lldrv_dbg.c b/fpgafs_lldrv_dbg.c index 1def73b..1086998 100644 --- a/fpgafs_lldrv_dbg.c +++ b/fpgafs_lldrv_dbg.c @@ -11,7 +11,7 @@ static int load = 0; static unsigned char *load_buf; -static int fpgafs_send_data_dbg(unsigned char *buf, int len) +static int fpgafs_send_data_dbg(const char __user *buf, int len) { printk("fpgafs: send data DEBUG\n"); return 0; @@ -36,7 +36,7 @@ static int fpgafs_read_load_dbg(unsigned char *buf, int len) return len; } -static int fpgafs_write_load_dbg(unsigned char *buf, int len) +static int fpgafs_write_load_dbg(const char __user *buf, int len) { u32 cp = 0; u8 __user *usr; diff --git a/llmgmt.c b/llmgmt.c index 93c50a7..6e6c9cd 100644 --- a/llmgmt.c +++ b/llmgmt.c @@ -13,7 +13,7 @@ static struct fpgafs_lldrv *lldrv_cur; static int lldrv_count = 0x0; static DEFINE_SPINLOCK(fpgafs_lldrv_lock); -ssize_t fpgafs_send_data(struct file *file, char __user *buf, +ssize_t fpgafs_send_data(struct file *file, const char __user *buf, size_t len, loff_t *pos) { return (lldrv_cur) ? lldrv_cur->send(buf, len) : -EBUSY;