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/act2000/capi.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/act2000/capi.h')
-rw-r--r-- | drivers/isdn/act2000/capi.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/drivers/isdn/act2000/capi.h b/drivers/isdn/act2000/capi.h index e55f6a931f66..01ccdecd43f7 100644 --- a/drivers/isdn/act2000/capi.h +++ b/drivers/isdn/act2000/capi.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Author Fritz Elfert | 5 | * Author Fritz Elfert |
6 | * Copyright by Fritz Elfert <fritz@isdn4linux.de> | 6 | * Copyright by Fritz Elfert <fritz@isdn4linux.de> |
7 | * | 7 | * |
8 | * This software may be used and distributed according to the terms | 8 | * This software may be used and distributed according to the terms |
9 | * of the GNU General Public License, incorporated herein by reference. | 9 | * of the GNU General Public License, incorporated herein by reference. |
10 | * | 10 | * |
@@ -46,10 +46,10 @@ typedef struct actcapi_addr { | |||
46 | typedef union actcapi_infonr { /* info number */ | 46 | typedef union actcapi_infonr { /* info number */ |
47 | __u16 mask; /* info-mask field */ | 47 | __u16 mask; /* info-mask field */ |
48 | struct bmask { /* bit definitions */ | 48 | struct bmask { /* bit definitions */ |
49 | unsigned codes : 3; /* code set */ | 49 | unsigned codes:3; /* code set */ |
50 | unsigned rsvd : 5; /* reserved */ | 50 | unsigned rsvd:5; /* reserved */ |
51 | unsigned svind : 1; /* single, variable length ind. */ | 51 | unsigned svind:1; /* single, variable length ind. */ |
52 | unsigned wtype : 7; /* W-element type */ | 52 | unsigned wtype:7; /* W-element type */ |
53 | } bmask; | 53 | } bmask; |
54 | } actcapi_infonr; | 54 | } actcapi_infonr; |
55 | 55 | ||
@@ -59,13 +59,13 @@ typedef union actcapi_infoel { /* info element */ | |||
59 | __u8 display[40]; /* display contents */ | 59 | __u8 display[40]; /* display contents */ |
60 | __u8 uuinfo[40]; /* User-user info field */ | 60 | __u8 uuinfo[40]; /* User-user info field */ |
61 | struct cause { /* Cause information */ | 61 | struct cause { /* Cause information */ |
62 | unsigned ext2 : 1; /* extension */ | 62 | unsigned ext2:1; /* extension */ |
63 | unsigned cod : 2; /* coding standard */ | 63 | unsigned cod:2; /* coding standard */ |
64 | unsigned spare : 1; /* spare */ | 64 | unsigned spare:1; /* spare */ |
65 | unsigned loc : 4; /* location */ | 65 | unsigned loc:4; /* location */ |
66 | unsigned ext1 : 1; /* extension */ | 66 | unsigned ext1:1; /* extension */ |
67 | unsigned cval : 7; /* Cause value */ | 67 | unsigned cval:7; /* Cause value */ |
68 | } cause; | 68 | } cause; |
69 | struct charge { /* Charging information */ | 69 | struct charge { /* Charging information */ |
70 | __u8 toc; /* type of charging info */ | 70 | __u8 toc; /* type of charging info */ |
71 | __u8 unit[10]; /* charging units */ | 71 | __u8 unit[10]; /* charging units */ |
@@ -111,14 +111,14 @@ typedef struct actcapi_ncpd { | |||
111 | * Bit 5-7 = Controller | 111 | * Bit 5-7 = Controller |
112 | * Bit 8-15 = NCCI | 112 | * Bit 8-15 = NCCI |
113 | */ | 113 | */ |
114 | #define MAKE_NCCI(plci,contr,ncci) \ | 114 | #define MAKE_NCCI(plci, contr, ncci) \ |
115 | ((plci & 0x1f) | ((contr & 0x7) << 5) | ((ncci & 0xff) << 8)) | 115 | ((plci & 0x1f) | ((contr & 0x7) << 5) | ((ncci & 0xff) << 8)) |
116 | 116 | ||
117 | #define EVAL_NCCI(fakencci,plci,contr,ncci) { \ | 117 | #define EVAL_NCCI(fakencci, plci, contr, ncci) { \ |
118 | plci = fakencci & 0x1f; \ | 118 | plci = fakencci & 0x1f; \ |
119 | contr = (fakencci >> 5) & 0x7; \ | 119 | contr = (fakencci >> 5) & 0x7; \ |
120 | ncci = (fakencci >> 8) & 0xff; \ | 120 | ncci = (fakencci >> 8) & 0xff; \ |
121 | } | 121 | } |
122 | 122 | ||
123 | /* | 123 | /* |
124 | * Layout of PLCI field in a B3 DATA CAPI message is different from | 124 | * Layout of PLCI field in a B3 DATA CAPI message is different from |
@@ -128,13 +128,13 @@ typedef struct actcapi_ncpd { | |||
128 | * Bit 5-7 = Controller | 128 | * Bit 5-7 = Controller |
129 | * Bit 8-15 = reserved (must be 0) | 129 | * Bit 8-15 = reserved (must be 0) |
130 | */ | 130 | */ |
131 | #define MAKE_PLCI(plci,contr) \ | 131 | #define MAKE_PLCI(plci, contr) \ |
132 | ((plci & 0x1f) | ((contr & 0x7) << 5)) | 132 | ((plci & 0x1f) | ((contr & 0x7) << 5)) |
133 | 133 | ||
134 | #define EVAL_PLCI(fakeplci,plci,contr) { \ | 134 | #define EVAL_PLCI(fakeplci, plci, contr) { \ |
135 | plci = fakeplci & 0x1f; \ | 135 | plci = fakeplci & 0x1f; \ |
136 | contr = (fakeplci >> 5) & 0x7; \ | 136 | contr = (fakeplci >> 5) & 0x7; \ |
137 | } | 137 | } |
138 | 138 | ||
139 | typedef struct actcapi_msg { | 139 | typedef struct actcapi_msg { |
140 | actcapi_msghdr hdr; | 140 | actcapi_msghdr hdr; |