patch-2.4.6 linux/drivers/char/n_r3964.c
Next file: linux/drivers/char/nvram.c
Previous file: linux/drivers/char/i810-tco.c
Back to the patch index
Back to the overall index
- Lines: 37
- Date:
Wed Jun 27 14:13:01 2001
- Orig file:
v2.4.5/linux/drivers/char/n_r3964.c
- Orig date:
Fri Apr 13 20:26:07 2001
diff -u --recursive --new-file v2.4.5/linux/drivers/char/n_r3964.c linux/drivers/char/n_r3964.c
@@ -132,10 +132,10 @@
static int r3964_open(struct tty_struct *tty);
static void r3964_close(struct tty_struct *tty);
-static int r3964_read(struct tty_struct *tty, struct file *file,
- unsigned char *buf, unsigned int nr);
-static int r3964_write(struct tty_struct * tty, struct file * file,
- const unsigned char * buf, unsigned int nr);
+static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
+ unsigned char *buf, size_t nr);
+static ssize_t r3964_write(struct tty_struct * tty, struct file * file,
+ const unsigned char * buf, size_t nr);
static int r3964_ioctl(struct tty_struct * tty, struct file * file,
unsigned int cmd, unsigned long arg);
static void r3964_set_termios(struct tty_struct *tty, struct termios * old);
@@ -1238,8 +1238,8 @@
MOD_DEC_USE_COUNT;
}
-static int r3964_read(struct tty_struct *tty, struct file *file,
- unsigned char *buf, unsigned int nr)
+static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
+ unsigned char *buf, size_t nr)
{
struct r3964_info *pInfo=(struct r3964_info*)tty->disc_data;
struct r3964_client_info *pClient;
@@ -1299,8 +1299,8 @@
return -EPERM;
}
-static int r3964_write(struct tty_struct * tty, struct file * file,
- const unsigned char *data, unsigned int count)
+static ssize_t r3964_write(struct tty_struct * tty, struct file * file,
+ const unsigned char *data, size_t count)
{
struct r3964_info *pInfo=(struct r3964_info*)tty->disc_data;
struct r3964_block_header *pHeader;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)