diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 09:24:53 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-11 02:19:47 -0500 |
commit | 6819bc2e1e46c71711a8dddf4040e706b02973c0 (patch) | |
tree | 6baa6c808fd70a01d5e95c77b02d0a6c5409cc9e /net/irda/ircomm/ircomm_event.c | |
parent | 981c0ff6900c981668a798fe9e0bc5ba32ee3fd4 (diff) |
[NET] IRDA: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/ircomm/ircomm_event.c')
-rw-r--r-- | net/irda/ircomm/ircomm_event.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/net/irda/ircomm/ircomm_event.c b/net/irda/ircomm/ircomm_event.c index 01f4e801a1ba..23d0468794e2 100644 --- a/net/irda/ircomm/ircomm_event.c +++ b/net/irda/ircomm/ircomm_event.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************* | 1 | /********************************************************************* |
2 | * | 2 | * |
3 | * Filename: ircomm_event.c | 3 | * Filename: ircomm_event.c |
4 | * Version: 1.0 | 4 | * Version: 1.0 |
5 | * Description: IrCOMM layer state machine | 5 | * Description: IrCOMM layer state machine |
@@ -8,24 +8,24 @@ | |||
8 | * Created at: Sun Jun 6 20:33:11 1999 | 8 | * Created at: Sun Jun 6 20:33:11 1999 |
9 | * Modified at: Sun Dec 12 13:44:32 1999 | 9 | * Modified at: Sun Dec 12 13:44:32 1999 |
10 | * Modified by: Dag Brattli <dagb@cs.uit.no> | 10 | * Modified by: Dag Brattli <dagb@cs.uit.no> |
11 | * | 11 | * |
12 | * Copyright (c) 1999 Dag Brattli, All Rights Reserved. | 12 | * Copyright (c) 1999 Dag Brattli, All Rights Reserved. |
13 | * | 13 | * |
14 | * This program is free software; you can redistribute it and/or | 14 | * This program is free software; you can redistribute it and/or |
15 | * modify it under the terms of the GNU General Public License as | 15 | * modify it under the terms of the GNU General Public License as |
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * This program is distributed in the hope that it will be useful, | 19 | * This program is distributed in the hope that it will be useful, |
20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
22 | * GNU General Public License for more details. | 22 | * GNU General Public License for more details. |
23 | * | 23 | * |
24 | * You should have received a copy of the GNU General Public License | 24 | * You should have received a copy of the GNU General Public License |
25 | * along with this program; if not, write to the Free Software | 25 | * along with this program; if not, write to the Free Software |
26 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 26 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
27 | * MA 02111-1307 USA | 27 | * MA 02111-1307 USA |
28 | * | 28 | * |
29 | ********************************************************************/ | 29 | ********************************************************************/ |
30 | 30 | ||
31 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
@@ -41,13 +41,13 @@ | |||
41 | #include <net/irda/ircomm_core.h> | 41 | #include <net/irda/ircomm_core.h> |
42 | #include <net/irda/ircomm_event.h> | 42 | #include <net/irda/ircomm_event.h> |
43 | 43 | ||
44 | static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event, | 44 | static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event, |
45 | struct sk_buff *skb, struct ircomm_info *info); | 45 | struct sk_buff *skb, struct ircomm_info *info); |
46 | static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event, | 46 | static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event, |
47 | struct sk_buff *skb, struct ircomm_info *info); | 47 | struct sk_buff *skb, struct ircomm_info *info); |
48 | static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event, | 48 | static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event, |
49 | struct sk_buff *skb, struct ircomm_info *info); | 49 | struct sk_buff *skb, struct ircomm_info *info); |
50 | static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, | 50 | static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, |
51 | struct sk_buff *skb, struct ircomm_info *info); | 51 | struct sk_buff *skb, struct ircomm_info *info); |
52 | 52 | ||
53 | char *ircomm_state[] = { | 53 | char *ircomm_state[] = { |
@@ -60,26 +60,26 @@ char *ircomm_state[] = { | |||
60 | #ifdef CONFIG_IRDA_DEBUG | 60 | #ifdef CONFIG_IRDA_DEBUG |
61 | static char *ircomm_event[] = { | 61 | static char *ircomm_event[] = { |
62 | "IRCOMM_CONNECT_REQUEST", | 62 | "IRCOMM_CONNECT_REQUEST", |
63 | "IRCOMM_CONNECT_RESPONSE", | 63 | "IRCOMM_CONNECT_RESPONSE", |
64 | "IRCOMM_TTP_CONNECT_INDICATION", | 64 | "IRCOMM_TTP_CONNECT_INDICATION", |
65 | "IRCOMM_LMP_CONNECT_INDICATION", | 65 | "IRCOMM_LMP_CONNECT_INDICATION", |
66 | "IRCOMM_TTP_CONNECT_CONFIRM", | 66 | "IRCOMM_TTP_CONNECT_CONFIRM", |
67 | "IRCOMM_LMP_CONNECT_CONFIRM", | 67 | "IRCOMM_LMP_CONNECT_CONFIRM", |
68 | 68 | ||
69 | "IRCOMM_LMP_DISCONNECT_INDICATION", | 69 | "IRCOMM_LMP_DISCONNECT_INDICATION", |
70 | "IRCOMM_TTP_DISCONNECT_INDICATION", | 70 | "IRCOMM_TTP_DISCONNECT_INDICATION", |
71 | "IRCOMM_DISCONNECT_REQUEST", | 71 | "IRCOMM_DISCONNECT_REQUEST", |
72 | 72 | ||
73 | "IRCOMM_TTP_DATA_INDICATION", | 73 | "IRCOMM_TTP_DATA_INDICATION", |
74 | "IRCOMM_LMP_DATA_INDICATION", | 74 | "IRCOMM_LMP_DATA_INDICATION", |
75 | "IRCOMM_DATA_REQUEST", | 75 | "IRCOMM_DATA_REQUEST", |
76 | "IRCOMM_CONTROL_REQUEST", | 76 | "IRCOMM_CONTROL_REQUEST", |
77 | "IRCOMM_CONTROL_INDICATION", | 77 | "IRCOMM_CONTROL_INDICATION", |
78 | }; | 78 | }; |
79 | #endif /* CONFIG_IRDA_DEBUG */ | 79 | #endif /* CONFIG_IRDA_DEBUG */ |
80 | 80 | ||
81 | static int (*state[])(struct ircomm_cb *self, IRCOMM_EVENT event, | 81 | static int (*state[])(struct ircomm_cb *self, IRCOMM_EVENT event, |
82 | struct sk_buff *skb, struct ircomm_info *info) = | 82 | struct sk_buff *skb, struct ircomm_info *info) = |
83 | { | 83 | { |
84 | ircomm_state_idle, | 84 | ircomm_state_idle, |
85 | ircomm_state_waiti, | 85 | ircomm_state_waiti, |
@@ -93,14 +93,14 @@ static int (*state[])(struct ircomm_cb *self, IRCOMM_EVENT event, | |||
93 | * IrCOMM is currently idle | 93 | * IrCOMM is currently idle |
94 | * | 94 | * |
95 | */ | 95 | */ |
96 | static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event, | 96 | static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event, |
97 | struct sk_buff *skb, struct ircomm_info *info) | 97 | struct sk_buff *skb, struct ircomm_info *info) |
98 | { | 98 | { |
99 | int ret = 0; | 99 | int ret = 0; |
100 | 100 | ||
101 | switch (event) { | 101 | switch (event) { |
102 | case IRCOMM_CONNECT_REQUEST: | 102 | case IRCOMM_CONNECT_REQUEST: |
103 | ircomm_next_state(self, IRCOMM_WAITI); | 103 | ircomm_next_state(self, IRCOMM_WAITI); |
104 | ret = self->issue.connect_request(self, skb, info); | 104 | ret = self->issue.connect_request(self, skb, info); |
105 | break; | 105 | break; |
106 | case IRCOMM_TTP_CONNECT_INDICATION: | 106 | case IRCOMM_TTP_CONNECT_INDICATION: |
@@ -119,10 +119,10 @@ static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event, | |||
119 | /* | 119 | /* |
120 | * Function ircomm_state_waiti (self, event, skb) | 120 | * Function ircomm_state_waiti (self, event, skb) |
121 | * | 121 | * |
122 | * The IrCOMM user has requested an IrCOMM connection to the remote | 122 | * The IrCOMM user has requested an IrCOMM connection to the remote |
123 | * device and is awaiting confirmation | 123 | * device and is awaiting confirmation |
124 | */ | 124 | */ |
125 | static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event, | 125 | static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event, |
126 | struct sk_buff *skb, struct ircomm_info *info) | 126 | struct sk_buff *skb, struct ircomm_info *info) |
127 | { | 127 | { |
128 | int ret = 0; | 128 | int ret = 0; |
@@ -152,8 +152,8 @@ static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event, | |||
152 | * IrCOMM has received an incoming connection request and is awaiting | 152 | * IrCOMM has received an incoming connection request and is awaiting |
153 | * response from the user | 153 | * response from the user |
154 | */ | 154 | */ |
155 | static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event, | 155 | static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event, |
156 | struct sk_buff *skb, struct ircomm_info *info) | 156 | struct sk_buff *skb, struct ircomm_info *info) |
157 | { | 157 | { |
158 | int ret = 0; | 158 | int ret = 0; |
159 | 159 | ||
@@ -185,7 +185,7 @@ static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event, | |||
185 | * IrCOMM is connected to the peer IrCOMM device | 185 | * IrCOMM is connected to the peer IrCOMM device |
186 | * | 186 | * |
187 | */ | 187 | */ |
188 | static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, | 188 | static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, |
189 | struct sk_buff *skb, struct ircomm_info *info) | 189 | struct sk_buff *skb, struct ircomm_info *info) |
190 | { | 190 | { |
191 | int ret = 0; | 191 | int ret = 0; |
@@ -228,7 +228,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, | |||
228 | * | 228 | * |
229 | */ | 229 | */ |
230 | int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event, | 230 | int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event, |
231 | struct sk_buff *skb, struct ircomm_info *info) | 231 | struct sk_buff *skb, struct ircomm_info *info) |
232 | { | 232 | { |
233 | IRDA_DEBUG(4, "%s: state=%s, event=%s\n", __FUNCTION__ , | 233 | IRDA_DEBUG(4, "%s: state=%s, event=%s\n", __FUNCTION__ , |
234 | ircomm_state[self->state], ircomm_event[event]); | 234 | ircomm_state[self->state], ircomm_event[event]); |
@@ -245,7 +245,7 @@ int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event, | |||
245 | void ircomm_next_state(struct ircomm_cb *self, IRCOMM_STATE state) | 245 | void ircomm_next_state(struct ircomm_cb *self, IRCOMM_STATE state) |
246 | { | 246 | { |
247 | self->state = state; | 247 | self->state = state; |
248 | 248 | ||
249 | IRDA_DEBUG(4, "%s: next state=%s, service type=%d\n", __FUNCTION__ , | 249 | IRDA_DEBUG(4, "%s: next state=%s, service type=%d\n", __FUNCTION__ , |
250 | ircomm_state[self->state], self->service_type); | 250 | ircomm_state[self->state], self->service_type); |
251 | } | 251 | } |