diff options
author | Joe Perches <joe@perches.com> | 2012-02-19 22:52:38 -0500 |
---|---|---|
committer | Joe Perches <joe@perches.com> | 2012-02-21 12:04:01 -0500 |
commit | 475be4d85a274d0961593db41cf85689db1d583c (patch) | |
tree | b2b8931eb747794730522c3cf1898e46948527b9 /drivers/isdn/divert/isdn_divert.h | |
parent | 0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff) |
isdn: whitespace coding style cleanup
isdn source code uses a not-current coding style.
Update the coding style used on a per-line basis
so that git diff -w shows only elided blank lines
at EOF.
Done with emacs and some scripts and some typing.
Built x86 allyesconfig.
No detected change in objdump -d or size.
Signed-off-by: Joe Perches <joe@perches.com>
Diffstat (limited to 'drivers/isdn/divert/isdn_divert.h')
-rw-r--r-- | drivers/isdn/divert/isdn_divert.h | 116 |
1 files changed, 58 insertions, 58 deletions
diff --git a/drivers/isdn/divert/isdn_divert.h b/drivers/isdn/divert/isdn_divert.h index 19439a6176a9..42f289320d2d 100644 --- a/drivers/isdn/divert/isdn_divert.h +++ b/drivers/isdn/divert/isdn_divert.h | |||
@@ -3,7 +3,7 @@ | |||
3 | * Header for the diversion supplementary ioctl interface. | 3 | * Header for the diversion supplementary ioctl interface. |
4 | * | 4 | * |
5 | * Copyright 1998 by Werner Cornelius (werner@ikt.de) | 5 | * Copyright 1998 by Werner Cornelius (werner@ikt.de) |
6 | * | 6 | * |
7 | * This software may be used and distributed according to the terms | 7 | * This software may be used and distributed according to the terms |
8 | * of the GNU General Public License, incorporated herein by reference. | 8 | * of the GNU General Public License, incorporated herein by reference. |
9 | * | 9 | * |
@@ -20,13 +20,13 @@ | |||
20 | #define IIOCGETDRV _IO('I', 2) /* get driver number */ | 20 | #define IIOCGETDRV _IO('I', 2) /* get driver number */ |
21 | #define IIOCGETNAM _IO('I', 3) /* get driver name */ | 21 | #define IIOCGETNAM _IO('I', 3) /* get driver name */ |
22 | #define IIOCGETRULE _IO('I', 4) /* read one rule */ | 22 | #define IIOCGETRULE _IO('I', 4) /* read one rule */ |
23 | #define IIOCMODRULE _IO('I', 5) /* modify/replace a rule */ | 23 | #define IIOCMODRULE _IO('I', 5) /* modify/replace a rule */ |
24 | #define IIOCINSRULE _IO('I', 6) /* insert/append one rule */ | 24 | #define IIOCINSRULE _IO('I', 6) /* insert/append one rule */ |
25 | #define IIOCDELRULE _IO('I', 7) /* delete a rule */ | 25 | #define IIOCDELRULE _IO('I', 7) /* delete a rule */ |
26 | #define IIOCDODFACT _IO('I', 8) /* hangup/reject/alert/immediately deflect a call */ | 26 | #define IIOCDODFACT _IO('I', 8) /* hangup/reject/alert/immediately deflect a call */ |
27 | #define IIOCDOCFACT _IO('I', 9) /* activate control forwarding in PBX */ | 27 | #define IIOCDOCFACT _IO('I', 9) /* activate control forwarding in PBX */ |
28 | #define IIOCDOCFDIS _IO('I',10) /* deactivate control forwarding in PBX */ | 28 | #define IIOCDOCFDIS _IO('I', 10) /* deactivate control forwarding in PBX */ |
29 | #define IIOCDOCFINT _IO('I',11) /* interrogate control forwarding in PBX */ | 29 | #define IIOCDOCFINT _IO('I', 11) /* interrogate control forwarding in PBX */ |
30 | 30 | ||
31 | /*************************************/ | 31 | /*************************************/ |
32 | /* states reported through interface */ | 32 | /* states reported through interface */ |
@@ -34,65 +34,65 @@ | |||
34 | #define DEFLECT_IGNORE 0 /* ignore incoming call */ | 34 | #define DEFLECT_IGNORE 0 /* ignore incoming call */ |
35 | #define DEFLECT_REPORT 1 /* only report */ | 35 | #define DEFLECT_REPORT 1 /* only report */ |
36 | #define DEFLECT_PROCEED 2 /* deflect when externally triggered */ | 36 | #define DEFLECT_PROCEED 2 /* deflect when externally triggered */ |
37 | #define DEFLECT_ALERT 3 /* alert and deflect after delay */ | 37 | #define DEFLECT_ALERT 3 /* alert and deflect after delay */ |
38 | #define DEFLECT_REJECT 4 /* reject immediately */ | 38 | #define DEFLECT_REJECT 4 /* reject immediately */ |
39 | #define DIVERT_ACTIVATE 5 /* diversion activate */ | 39 | #define DIVERT_ACTIVATE 5 /* diversion activate */ |
40 | #define DIVERT_DEACTIVATE 6 /* diversion deactivate */ | 40 | #define DIVERT_DEACTIVATE 6 /* diversion deactivate */ |
41 | #define DIVERT_REPORT 7 /* interrogation result */ | 41 | #define DIVERT_REPORT 7 /* interrogation result */ |
42 | #define DEFLECT_AUTODEL 255 /* only for internal use */ | 42 | #define DEFLECT_AUTODEL 255 /* only for internal use */ |
43 | 43 | ||
44 | #define DEFLECT_ALL_IDS 0xFFFFFFFF /* all drivers selected */ | 44 | #define DEFLECT_ALL_IDS 0xFFFFFFFF /* all drivers selected */ |
45 | 45 | ||
46 | typedef struct | 46 | typedef struct |
47 | { ulong drvid; /* driver ids, bit mapped */ | 47 | { ulong drvid; /* driver ids, bit mapped */ |
48 | char my_msn[35]; /* desired msn, subaddr allowed */ | 48 | char my_msn[35]; /* desired msn, subaddr allowed */ |
49 | char caller[35]; /* caller id, partial string with * + subaddr allowed */ | 49 | char caller[35]; /* caller id, partial string with * + subaddr allowed */ |
50 | char to_nr[35]; /* deflected to number incl. subaddress */ | 50 | char to_nr[35]; /* deflected to number incl. subaddress */ |
51 | u_char si1,si2; /* service indicators, si1=bitmask, si1+2 0 = all */ | 51 | u_char si1, si2; /* service indicators, si1=bitmask, si1+2 0 = all */ |
52 | u_char screen; /* screening: 0 = no info, 1 = info, 2 = nfo with nr */ | 52 | u_char screen; /* screening: 0 = no info, 1 = info, 2 = nfo with nr */ |
53 | u_char callopt; /* option for call handling: | 53 | u_char callopt; /* option for call handling: |
54 | 0 = all calls | 54 | 0 = all calls |
55 | 1 = only non waiting calls | 55 | 1 = only non waiting calls |
56 | 2 = only waiting calls */ | 56 | 2 = only waiting calls */ |
57 | u_char action; /* desired action: | 57 | u_char action; /* desired action: |
58 | 0 = don't report call -> ignore | 58 | 0 = don't report call -> ignore |
59 | 1 = report call, do not allow/proceed for deflection | 59 | 1 = report call, do not allow/proceed for deflection |
60 | 2 = report call, send proceed, wait max waittime secs | 60 | 2 = report call, send proceed, wait max waittime secs |
61 | 3 = report call, alert and deflect after waittime | 61 | 3 = report call, alert and deflect after waittime |
62 | 4 = report call, reject immediately | 62 | 4 = report call, reject immediately |
63 | actions 1-2 only take place if interface is opened | 63 | actions 1-2 only take place if interface is opened |
64 | */ | 64 | */ |
65 | u_char waittime; /* maximum wait time for proceeding */ | 65 | u_char waittime; /* maximum wait time for proceeding */ |
66 | } divert_rule; | 66 | } divert_rule; |
67 | 67 | ||
68 | typedef union | 68 | typedef union |
69 | { int drv_version; /* return of driver version */ | 69 | { int drv_version; /* return of driver version */ |
70 | struct | 70 | struct |
71 | { int drvid; /* id of driver */ | 71 | { int drvid; /* id of driver */ |
72 | char drvnam[30]; /* name of driver */ | 72 | char drvnam[30]; /* name of driver */ |
73 | } getid; | 73 | } getid; |
74 | struct | 74 | struct |
75 | { int ruleidx; /* index of rule */ | 75 | { int ruleidx; /* index of rule */ |
76 | divert_rule rule; /* rule parms */ | 76 | divert_rule rule; /* rule parms */ |
77 | } getsetrule; | 77 | } getsetrule; |
78 | struct | 78 | struct |
79 | { u_char subcmd; /* 0 = hangup/reject, | 79 | { u_char subcmd; /* 0 = hangup/reject, |
80 | 1 = alert, | 80 | 1 = alert, |
81 | 2 = deflect */ | 81 | 2 = deflect */ |
82 | ulong callid; /* id of call delivered by ascii output */ | 82 | ulong callid; /* id of call delivered by ascii output */ |
83 | char to_nr[35]; /* destination when deflect, | 83 | char to_nr[35]; /* destination when deflect, |
84 | else uus1 string (maxlen 31), | 84 | else uus1 string (maxlen 31), |
85 | data from rule used if empty */ | 85 | data from rule used if empty */ |
86 | } fwd_ctrl; | 86 | } fwd_ctrl; |
87 | struct | 87 | struct |
88 | { int drvid; /* id of driver */ | 88 | { int drvid; /* id of driver */ |
89 | u_char cfproc; /* cfu = 0, cfb = 1, cfnr = 2 */ | 89 | u_char cfproc; /* cfu = 0, cfb = 1, cfnr = 2 */ |
90 | ulong procid; /* process id returned when no error */ | 90 | ulong procid; /* process id returned when no error */ |
91 | u_char service; /* basically coded service, 0 = all */ | 91 | u_char service; /* basically coded service, 0 = all */ |
92 | char msn[25]; /* desired msn, empty = all */ | 92 | char msn[25]; /* desired msn, empty = all */ |
93 | char fwd_nr[35];/* forwarded to number + subaddress */ | 93 | char fwd_nr[35];/* forwarded to number + subaddress */ |
94 | } cf_ctrl; | 94 | } cf_ctrl; |
95 | } divert_ioctl; | 95 | } divert_ioctl; |
96 | 96 | ||
97 | #ifdef __KERNEL__ | 97 | #ifdef __KERNEL__ |
98 | 98 | ||
@@ -105,10 +105,10 @@ typedef union | |||
105 | /* structure keeping ascii info for device output */ | 105 | /* structure keeping ascii info for device output */ |
106 | /**************************************************/ | 106 | /**************************************************/ |
107 | struct divert_info | 107 | struct divert_info |
108 | { struct divert_info *next; | 108 | { struct divert_info *next; |
109 | ulong usage_cnt; /* number of files still to work */ | 109 | ulong usage_cnt; /* number of files still to work */ |
110 | char info_start[2]; /* info string start */ | 110 | char info_start[2]; /* info string start */ |
111 | }; | 111 | }; |
112 | 112 | ||
113 | 113 | ||
114 | /**************/ | 114 | /**************/ |