diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /net/irda | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/irda_device.c | 1 | ||||
| -rw-r--r-- | net/irda/iriap_event.c | 6 | ||||
| -rw-r--r-- | net/irda/parameters.c | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c index 94345259d..9968e0e95 100644 --- a/net/irda/irda_device.c +++ b/net/irda/irda_device.c @@ -46,6 +46,7 @@ #include <asm/segment.h> #include <asm/uaccess.h> #include <asm/dma.h> +#include <asm/io.h> #include <net/pkt_sched.h> diff --git a/net/irda/iriap_event.c b/net/irda/iriap_event.c index eb8463b73..c073f5baf 100644 --- a/net/irda/iriap_event.c +++ b/net/irda/iriap_event.c @@ -6,10 +6,10 @@ * Status: Experimental. * Author: Dag Brattli <dagb@cs.uit.no> * Created at: Thu Aug 21 00:02:07 1997 - * Modified at: Sat Dec 25 21:09:47 1999 + * Modified at: Wed Mar 1 11:28:34 2000 * Modified by: Dag Brattli <dagb@cs.uit.no> * - * Copyright (c) 1997, 1999 Dag Brattli <dagb@cs.uit.no>, + * Copyright (c) 1997, 1999-2000 Dag Brattli <dagb@cs.uit.no>, * All Rights Reserved. * * This program is free software; you can redistribute it and/or @@ -294,7 +294,7 @@ static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event, switch (event) { case IAP_RECV_F_LST: - iriap_send_ack(self); + /*iriap_send_ack(self);*/ /*LM_Idle_request(idle); */ iriap_next_call_state(self, S_WAIT_FOR_CALL); diff --git a/net/irda/parameters.c b/net/irda/parameters.c index 19f76eae4..263c2e2a4 100644 --- a/net/irda/parameters.c +++ b/net/irda/parameters.c @@ -356,21 +356,23 @@ int irda_param_pack(__u8 *buf, char *fmt, ...) for (p = fmt; *p != '\0'; p++) { switch (*p) { case 'b': /* 8 bits unsigned byte */ - buf[n++] = va_arg(args, __u8); + buf[n++] = (__u8)va_arg(args, int); break; case 's': /* 16 bits unsigned short */ - arg.s = va_arg(args, __u16); + arg.s = (__u16)va_arg(args, int); put_unaligned(arg.s, (__u16 *)(buf+n)); n+=2; break; case 'i': /* 32 bits unsigned integer */ arg.i = va_arg(args, __u32); put_unaligned(arg.i, (__u32 *)(buf+n)); n+=4; break; +#if 0 case 'c': /* \0 terminated string */ arg.c = va_arg(args, char *); strcpy(buf+n, arg.c); n += strlen(arg.c) + 1; break; +#endif default: va_end(args); return -1; |