cd354f1ae7
After Al Viro (finally) succeeded in removing the sched.h #include in module.h recently, it makes sense again to remove other superfluous sched.h includes. There are quite a lot of files which include it but don't actually need anything defined in there. Presumably these includes were once needed for macros that used to live in sched.h, but moved to other header files in the course of cleaning it up. To ease the pain, this time I did not fiddle with any header files and only removed #includes from .c-files, which tend to cause less trouble. Compile tested against 2.6.20-rc2 and 2.6.20-rc2-mm2 (with offsets) on alpha, arm, i386, ia64, mips, powerpc, and x86_64 with allnoconfig, defconfig, allmodconfig, and allyesconfig as well as a few randconfigs on x86_64 and all configs in arch/arm/configs on arm. I also checked that no new warnings were introduced by the patch (actually, some warnings are removed that were emitted by unnecessarily included header files). Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
251 lines
6.9 KiB
C
251 lines
6.9 KiB
C
/*********************************************************************
|
|
*
|
|
* Filename: ircomm_event.c
|
|
* Version: 1.0
|
|
* Description: IrCOMM layer state machine
|
|
* Status: Stable
|
|
* Author: Dag Brattli <dagb@cs.uit.no>
|
|
* Created at: Sun Jun 6 20:33:11 1999
|
|
* Modified at: Sun Dec 12 13:44:32 1999
|
|
* Modified by: Dag Brattli <dagb@cs.uit.no>
|
|
*
|
|
* Copyright (c) 1999 Dag Brattli, All Rights Reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 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., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*
|
|
********************************************************************/
|
|
|
|
#include <linux/proc_fs.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <net/irda/irda.h>
|
|
#include <net/irda/irlmp.h>
|
|
#include <net/irda/iriap.h>
|
|
#include <net/irda/irttp.h>
|
|
#include <net/irda/irias_object.h>
|
|
|
|
#include <net/irda/ircomm_core.h>
|
|
#include <net/irda/ircomm_event.h>
|
|
|
|
static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event,
|
|
struct sk_buff *skb, struct ircomm_info *info);
|
|
static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event,
|
|
struct sk_buff *skb, struct ircomm_info *info);
|
|
static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event,
|
|
struct sk_buff *skb, struct ircomm_info *info);
|
|
static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event,
|
|
struct sk_buff *skb, struct ircomm_info *info);
|
|
|
|
char *ircomm_state[] = {
|
|
"IRCOMM_IDLE",
|
|
"IRCOMM_WAITI",
|
|
"IRCOMM_WAITR",
|
|
"IRCOMM_CONN",
|
|
};
|
|
|
|
#ifdef CONFIG_IRDA_DEBUG
|
|
static char *ircomm_event[] = {
|
|
"IRCOMM_CONNECT_REQUEST",
|
|
"IRCOMM_CONNECT_RESPONSE",
|
|
"IRCOMM_TTP_CONNECT_INDICATION",
|
|
"IRCOMM_LMP_CONNECT_INDICATION",
|
|
"IRCOMM_TTP_CONNECT_CONFIRM",
|
|
"IRCOMM_LMP_CONNECT_CONFIRM",
|
|
|
|
"IRCOMM_LMP_DISCONNECT_INDICATION",
|
|
"IRCOMM_TTP_DISCONNECT_INDICATION",
|
|
"IRCOMM_DISCONNECT_REQUEST",
|
|
|
|
"IRCOMM_TTP_DATA_INDICATION",
|
|
"IRCOMM_LMP_DATA_INDICATION",
|
|
"IRCOMM_DATA_REQUEST",
|
|
"IRCOMM_CONTROL_REQUEST",
|
|
"IRCOMM_CONTROL_INDICATION",
|
|
};
|
|
#endif /* CONFIG_IRDA_DEBUG */
|
|
|
|
static int (*state[])(struct ircomm_cb *self, IRCOMM_EVENT event,
|
|
struct sk_buff *skb, struct ircomm_info *info) =
|
|
{
|
|
ircomm_state_idle,
|
|
ircomm_state_waiti,
|
|
ircomm_state_waitr,
|
|
ircomm_state_conn,
|
|
};
|
|
|
|
/*
|
|
* Function ircomm_state_idle (self, event, skb)
|
|
*
|
|
* IrCOMM is currently idle
|
|
*
|
|
*/
|
|
static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event,
|
|
struct sk_buff *skb, struct ircomm_info *info)
|
|
{
|
|
int ret = 0;
|
|
|
|
switch (event) {
|
|
case IRCOMM_CONNECT_REQUEST:
|
|
ircomm_next_state(self, IRCOMM_WAITI);
|
|
ret = self->issue.connect_request(self, skb, info);
|
|
break;
|
|
case IRCOMM_TTP_CONNECT_INDICATION:
|
|
case IRCOMM_LMP_CONNECT_INDICATION:
|
|
ircomm_next_state(self, IRCOMM_WAITR);
|
|
ircomm_connect_indication(self, skb, info);
|
|
break;
|
|
default:
|
|
IRDA_DEBUG(4, "%s(), unknown event: %s\n", __FUNCTION__ ,
|
|
ircomm_event[event]);
|
|
ret = -EINVAL;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Function ircomm_state_waiti (self, event, skb)
|
|
*
|
|
* The IrCOMM user has requested an IrCOMM connection to the remote
|
|
* device and is awaiting confirmation
|
|
*/
|
|
static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event,
|
|
struct sk_buff *skb, struct ircomm_info *info)
|
|
{
|
|
int ret = 0;
|
|
|
|
switch (event) {
|
|
case IRCOMM_TTP_CONNECT_CONFIRM:
|
|
case IRCOMM_LMP_CONNECT_CONFIRM:
|
|
ircomm_next_state(self, IRCOMM_CONN);
|
|
ircomm_connect_confirm(self, skb, info);
|
|
break;
|
|
case IRCOMM_TTP_DISCONNECT_INDICATION:
|
|
case IRCOMM_LMP_DISCONNECT_INDICATION:
|
|
ircomm_next_state(self, IRCOMM_IDLE);
|
|
ircomm_disconnect_indication(self, skb, info);
|
|
break;
|
|
default:
|
|
IRDA_DEBUG(0, "%s(), unknown event: %s\n", __FUNCTION__ ,
|
|
ircomm_event[event]);
|
|
ret = -EINVAL;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Function ircomm_state_waitr (self, event, skb)
|
|
*
|
|
* IrCOMM has received an incoming connection request and is awaiting
|
|
* response from the user
|
|
*/
|
|
static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event,
|
|
struct sk_buff *skb, struct ircomm_info *info)
|
|
{
|
|
int ret = 0;
|
|
|
|
switch (event) {
|
|
case IRCOMM_CONNECT_RESPONSE:
|
|
ircomm_next_state(self, IRCOMM_CONN);
|
|
ret = self->issue.connect_response(self, skb);
|
|
break;
|
|
case IRCOMM_DISCONNECT_REQUEST:
|
|
ircomm_next_state(self, IRCOMM_IDLE);
|
|
ret = self->issue.disconnect_request(self, skb, info);
|
|
break;
|
|
case IRCOMM_TTP_DISCONNECT_INDICATION:
|
|
case IRCOMM_LMP_DISCONNECT_INDICATION:
|
|
ircomm_next_state(self, IRCOMM_IDLE);
|
|
ircomm_disconnect_indication(self, skb, info);
|
|
break;
|
|
default:
|
|
IRDA_DEBUG(0, "%s(), unknown event = %s\n", __FUNCTION__ ,
|
|
ircomm_event[event]);
|
|
ret = -EINVAL;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Function ircomm_state_conn (self, event, skb)
|
|
*
|
|
* IrCOMM is connected to the peer IrCOMM device
|
|
*
|
|
*/
|
|
static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event,
|
|
struct sk_buff *skb, struct ircomm_info *info)
|
|
{
|
|
int ret = 0;
|
|
|
|
switch (event) {
|
|
case IRCOMM_DATA_REQUEST:
|
|
ret = self->issue.data_request(self, skb, 0);
|
|
break;
|
|
case IRCOMM_TTP_DATA_INDICATION:
|
|
ircomm_process_data(self, skb);
|
|
break;
|
|
case IRCOMM_LMP_DATA_INDICATION:
|
|
ircomm_data_indication(self, skb);
|
|
break;
|
|
case IRCOMM_CONTROL_REQUEST:
|
|
/* Just send a separate frame for now */
|
|
ret = self->issue.data_request(self, skb, skb->len);
|
|
break;
|
|
case IRCOMM_TTP_DISCONNECT_INDICATION:
|
|
case IRCOMM_LMP_DISCONNECT_INDICATION:
|
|
ircomm_next_state(self, IRCOMM_IDLE);
|
|
ircomm_disconnect_indication(self, skb, info);
|
|
break;
|
|
case IRCOMM_DISCONNECT_REQUEST:
|
|
ircomm_next_state(self, IRCOMM_IDLE);
|
|
ret = self->issue.disconnect_request(self, skb, info);
|
|
break;
|
|
default:
|
|
IRDA_DEBUG(0, "%s(), unknown event = %s\n", __FUNCTION__ ,
|
|
ircomm_event[event]);
|
|
ret = -EINVAL;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Function ircomm_do_event (self, event, skb)
|
|
*
|
|
* Process event
|
|
*
|
|
*/
|
|
int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event,
|
|
struct sk_buff *skb, struct ircomm_info *info)
|
|
{
|
|
IRDA_DEBUG(4, "%s: state=%s, event=%s\n", __FUNCTION__ ,
|
|
ircomm_state[self->state], ircomm_event[event]);
|
|
|
|
return (*state[self->state])(self, event, skb, info);
|
|
}
|
|
|
|
/*
|
|
* Function ircomm_next_state (self, state)
|
|
*
|
|
* Switch state
|
|
*
|
|
*/
|
|
void ircomm_next_state(struct ircomm_cb *self, IRCOMM_STATE state)
|
|
{
|
|
self->state = state;
|
|
|
|
IRDA_DEBUG(4, "%s: next state=%s, service type=%d\n", __FUNCTION__ ,
|
|
ircomm_state[self->state], self->service_type);
|
|
}
|