aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hardware/mISDN/hfc_multi.h
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-02-19 22:52:38 -0500
committerJoe Perches <joe@perches.com>2012-02-21 12:04:01 -0500
commit475be4d85a274d0961593db41cf85689db1d583c (patch)
treeb2b8931eb747794730522c3cf1898e46948527b9 /drivers/isdn/hardware/mISDN/hfc_multi.h
parent0b0a635f79f91f3755b6518627ea06dd0dbfd523 (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/hardware/mISDN/hfc_multi.h')
-rw-r--r--drivers/isdn/hardware/mISDN/hfc_multi.h47
1 files changed, 23 insertions, 24 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfc_multi.h b/drivers/isdn/hardware/mISDN/hfc_multi.h
index 0c773866efc7..b0588acbb47d 100644
--- a/drivers/isdn/hardware/mISDN/hfc_multi.h
+++ b/drivers/isdn/hardware/mISDN/hfc_multi.h
@@ -33,13 +33,13 @@
33 */ 33 */
34 34
35/* 35/*
36#define MAX_FRAME_SIZE 2048 36 #define MAX_FRAME_SIZE 2048
37*/ 37*/
38 38
39struct hfc_chan { 39struct hfc_chan {
40 struct dchannel *dch; /* link if channel is a D-channel */ 40 struct dchannel *dch; /* link if channel is a D-channel */
41 struct bchannel *bch; /* link if channel is a B-channel */ 41 struct bchannel *bch; /* link if channel is a B-channel */
42 int port; /* the interface port this */ 42 int port; /* the interface port this */
43 /* channel is associated with */ 43 /* channel is associated with */
44 int nt_timer; /* -1 if off, 0 if elapsed, >0 if running */ 44 int nt_timer; /* -1 if off, 0 if elapsed, >0 if running */
45 int los, ais, slip_tx, slip_rx, rdi; /* current alarms */ 45 int los, ais, slip_tx, slip_rx, rdi; /* current alarms */
@@ -89,7 +89,7 @@ struct hfcm_hw {
89#define HFC_CFG_REPORT_RDI 8 /* the card should report remote alarm */ 89#define HFC_CFG_REPORT_RDI 8 /* the card should report remote alarm */
90#define HFC_CFG_DTMF 9 /* enable DTMF-detection */ 90#define HFC_CFG_DTMF 9 /* enable DTMF-detection */
91#define HFC_CFG_CRC4 10 /* disable CRC-4 Multiframe mode, */ 91#define HFC_CFG_CRC4 10 /* disable CRC-4 Multiframe mode, */
92 /* use double frame instead. */ 92/* use double frame instead. */
93 93
94#define HFC_TYPE_E1 1 /* controller is HFC-E1 */ 94#define HFC_TYPE_E1 1 /* controller is HFC-E1 */
95#define HFC_TYPE_4S 4 /* controller is HFC-4S */ 95#define HFC_TYPE_4S 4 /* controller is HFC-4S */
@@ -109,9 +109,9 @@ struct hfcm_hw {
109#define HFC_CHIP_E1CLOCK_GET 10 /* always get clock from E1 interface */ 109#define HFC_CHIP_E1CLOCK_GET 10 /* always get clock from E1 interface */
110#define HFC_CHIP_E1CLOCK_PUT 11 /* always put clock from E1 interface */ 110#define HFC_CHIP_E1CLOCK_PUT 11 /* always put clock from E1 interface */
111#define HFC_CHIP_WATCHDOG 12 /* whether we should send signals */ 111#define HFC_CHIP_WATCHDOG 12 /* whether we should send signals */
112 /* to the watchdog */ 112/* to the watchdog */
113#define HFC_CHIP_B410P 13 /* whether we have a b410p with echocan in */ 113#define HFC_CHIP_B410P 13 /* whether we have a b410p with echocan in */
114 /* hw */ 114/* hw */
115#define HFC_CHIP_PLXSD 14 /* whether we have a Speech-Design PLX */ 115#define HFC_CHIP_PLXSD 14 /* whether we have a Speech-Design PLX */
116#define HFC_CHIP_EMBSD 15 /* whether we have a SD Embedded board */ 116#define HFC_CHIP_EMBSD 15 /* whether we have a SD Embedded board */
117 117
@@ -148,26 +148,26 @@ struct hfc_multi {
148 int io_mode; /* selects mode */ 148 int io_mode; /* selects mode */
149#ifdef HFC_REGISTER_DEBUG 149#ifdef HFC_REGISTER_DEBUG
150 void (*HFC_outb)(struct hfc_multi *hc, u_char reg, 150 void (*HFC_outb)(struct hfc_multi *hc, u_char reg,
151 u_char val, const char *function, int line); 151 u_char val, const char *function, int line);
152 void (*HFC_outb_nodebug)(struct hfc_multi *hc, u_char reg, 152 void (*HFC_outb_nodebug)(struct hfc_multi *hc, u_char reg,
153 u_char val, const char *function, int line); 153 u_char val, const char *function, int line);
154 u_char (*HFC_inb)(struct hfc_multi *hc, u_char reg, 154 u_char (*HFC_inb)(struct hfc_multi *hc, u_char reg,
155 const char *function, int line); 155 const char *function, int line);
156 u_char (*HFC_inb_nodebug)(struct hfc_multi *hc, u_char reg, 156 u_char (*HFC_inb_nodebug)(struct hfc_multi *hc, u_char reg,
157 const char *function, int line); 157 const char *function, int line);
158 u_short (*HFC_inw)(struct hfc_multi *hc, u_char reg, 158 u_short (*HFC_inw)(struct hfc_multi *hc, u_char reg,
159 const char *function, int line); 159 const char *function, int line);
160 u_short (*HFC_inw_nodebug)(struct hfc_multi *hc, u_char reg, 160 u_short (*HFC_inw_nodebug)(struct hfc_multi *hc, u_char reg,
161 const char *function, int line); 161 const char *function, int line);
162 void (*HFC_wait)(struct hfc_multi *hc, 162 void (*HFC_wait)(struct hfc_multi *hc,
163 const char *function, int line); 163 const char *function, int line);
164 void (*HFC_wait_nodebug)(struct hfc_multi *hc, 164 void (*HFC_wait_nodebug)(struct hfc_multi *hc,
165 const char *function, int line); 165 const char *function, int line);
166#else 166#else
167 void (*HFC_outb)(struct hfc_multi *hc, u_char reg, 167 void (*HFC_outb)(struct hfc_multi *hc, u_char reg,
168 u_char val); 168 u_char val);
169 void (*HFC_outb_nodebug)(struct hfc_multi *hc, u_char reg, 169 void (*HFC_outb_nodebug)(struct hfc_multi *hc, u_char reg,
170 u_char val); 170 u_char val);
171 u_char (*HFC_inb)(struct hfc_multi *hc, u_char reg); 171 u_char (*HFC_inb)(struct hfc_multi *hc, u_char reg);
172 u_char (*HFC_inb_nodebug)(struct hfc_multi *hc, u_char reg); 172 u_char (*HFC_inb_nodebug)(struct hfc_multi *hc, u_char reg);
173 u_short (*HFC_inw)(struct hfc_multi *hc, u_char reg); 173 u_short (*HFC_inw)(struct hfc_multi *hc, u_char reg);
@@ -176,9 +176,9 @@ struct hfc_multi {
176 void (*HFC_wait_nodebug)(struct hfc_multi *hc); 176 void (*HFC_wait_nodebug)(struct hfc_multi *hc);
177#endif 177#endif
178 void (*read_fifo)(struct hfc_multi *hc, u_char *data, 178 void (*read_fifo)(struct hfc_multi *hc, u_char *data,
179 int len); 179 int len);
180 void (*write_fifo)(struct hfc_multi *hc, u_char *data, 180 void (*write_fifo)(struct hfc_multi *hc, u_char *data,
181 int len); 181 int len);
182 u_long pci_origmembase, plx_origmembase; 182 u_long pci_origmembase, plx_origmembase;
183 void __iomem *pci_membase; /* PCI memory */ 183 void __iomem *pci_membase; /* PCI memory */
184 void __iomem *plx_membase; /* PLX memory */ 184 void __iomem *plx_membase; /* PLX memory */
@@ -211,10 +211,10 @@ struct hfc_multi {
211 /* an optical Interface */ 211 /* an optical Interface */
212 int dslot; /* channel # of d-channel (E1) default 16 */ 212 int dslot; /* channel # of d-channel (E1) default 16 */
213 213
214 u_long wdcount; /* every 500 ms we need to */ 214 u_long wdcount; /* every 500 ms we need to */
215 /* send the watchdog a signal */ 215 /* send the watchdog a signal */
216 u_char wdbyte; /* watchdog toggle byte */ 216 u_char wdbyte; /* watchdog toggle byte */
217 u_int activity[8]; /* if there is any action on this */ 217 u_int activity[8]; /* if there is any action on this */
218 /* port (will be cleared after */ 218 /* port (will be cleared after */
219 /* showing led-states) */ 219 /* showing led-states) */
220 int e1_state; /* keep track of last state */ 220 int e1_state; /* keep track of last state */
@@ -268,7 +268,7 @@ struct hfc_multi {
268#define PLX_DSP_RES_N PLX_GPIO8 268#define PLX_DSP_RES_N PLX_GPIO8
269/* GPIO4..8 Enable & Set to OUT, SLAVE_EN_N = 1 */ 269/* GPIO4..8 Enable & Set to OUT, SLAVE_EN_N = 1 */
270#define PLX_GPIOC_INIT (PLX_GPIO4_DIR | PLX_GPIO5_DIR | PLX_GPIO6_DIR \ 270#define PLX_GPIOC_INIT (PLX_GPIO4_DIR | PLX_GPIO5_DIR | PLX_GPIO6_DIR \
271 | PLX_GPIO7_DIR | PLX_GPIO8_DIR | PLX_SLAVE_EN_N) 271 | PLX_GPIO7_DIR | PLX_GPIO8_DIR | PLX_SLAVE_EN_N)
272 272
273/* PLX Interrupt Control/STATUS */ 273/* PLX Interrupt Control/STATUS */
274#define PLX_INTCSR_LINTI1_ENABLE 0x01 274#define PLX_INTCSR_LINTI1_ENABLE 0x01
@@ -290,7 +290,7 @@ struct hfc_multi {
290/* write only registers */ 290/* write only registers */
291#define R_CIRM 0x00 291#define R_CIRM 0x00
292#define R_CTRL 0x01 292#define R_CTRL 0x01
293#define R_BRG_PCM_CFG 0x02 293#define R_BRG_PCM_CFG 0x02
294#define R_RAM_ADDR0 0x08 294#define R_RAM_ADDR0 0x08
295#define R_RAM_ADDR1 0x09 295#define R_RAM_ADDR1 0x09
296#define R_RAM_ADDR2 0x0A 296#define R_RAM_ADDR2 0x0A
@@ -687,8 +687,8 @@ struct hfc_multi {
687#define V_NEG_CLK 0x08 687#define V_NEG_CLK 0x08
688#define V_HCLK 0x10 688#define V_HCLK 0x10
689/* 689/*
690#define V_JATT_AUTO_DEL 0x20 690 #define V_JATT_AUTO_DEL 0x20
691#define V_JATT_AUTO 0x40 691 #define V_JATT_AUTO 0x40
692*/ 692*/
693#define V_JATT_OFF 0x80 693#define V_JATT_OFF 0x80
694/* R_STATE */ 694/* R_STATE */
@@ -1230,4 +1230,3 @@ struct hfc_register_names {
1230 {"R_IRQ_FIFO_BL7", 0xCF}, 1230 {"R_IRQ_FIFO_BL7", 0xCF},
1231}; 1231};
1232#endif /* HFC_REGISTER_DEBUG */ 1232#endif /* HFC_REGISTER_DEBUG */
1233
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-22 18:38:13 -0400