.. | .. |
---|
17 | 17 | return -EINVAL; |
---|
18 | 18 | } |
---|
19 | 19 | |
---|
20 | | - if ((tcpu = pci_alloc_consistent(pdev, size, &tdma)) != NULL) { |
---|
| 20 | + tcpu = pci_alloc_consistent(pdev, size, &tdma); |
---|
| 21 | + if (tcpu != NULL) { |
---|
21 | 22 | dma->pdev = pdev; |
---|
22 | 23 | dma->cpu_addr0 = tcpu; |
---|
23 | 24 | dma->dma_addr0 = tdma; |
---|
.. | .. |
---|
34 | 35 | { |
---|
35 | 36 | pci_free_consistent(dma->pdev, dma->size*2, |
---|
36 | 37 | dma->cpu_addr0, dma->dma_addr0); |
---|
37 | | - memset(dma,0,sizeof(struct flexcop_dma)); |
---|
| 38 | + memset(dma, 0, sizeof(struct flexcop_dma)); |
---|
38 | 39 | } |
---|
39 | 40 | EXPORT_SYMBOL(flexcop_dma_free); |
---|
40 | 41 | |
---|
.. | .. |
---|
42 | 43 | struct flexcop_dma *dma, |
---|
43 | 44 | flexcop_dma_index_t dma_idx) |
---|
44 | 45 | { |
---|
45 | | - flexcop_ibi_value v0x0,v0x4,v0xc; |
---|
46 | | - v0x0.raw = v0x4.raw = v0xc.raw = 0; |
---|
| 46 | + flexcop_ibi_value v0x0, v0x4, v0xc; |
---|
47 | 47 | |
---|
| 48 | + v0x0.raw = v0x4.raw = v0xc.raw = 0; |
---|
48 | 49 | v0x0.dma_0x0.dma_address0 = dma->dma_addr0 >> 2; |
---|
49 | 50 | v0xc.dma_0xc.dma_address1 = dma->dma_addr1 >> 2; |
---|
50 | 51 | v0x4.dma_0x4_write.dma_addr_size = dma->size / 4; |
---|
51 | 52 | |
---|
52 | 53 | if ((dma_idx & FC_DMA_1) == dma_idx) { |
---|
53 | | - fc->write_ibi_reg(fc,dma1_000,v0x0); |
---|
54 | | - fc->write_ibi_reg(fc,dma1_004,v0x4); |
---|
55 | | - fc->write_ibi_reg(fc,dma1_00c,v0xc); |
---|
| 54 | + fc->write_ibi_reg(fc, dma1_000, v0x0); |
---|
| 55 | + fc->write_ibi_reg(fc, dma1_004, v0x4); |
---|
| 56 | + fc->write_ibi_reg(fc, dma1_00c, v0xc); |
---|
56 | 57 | } else if ((dma_idx & FC_DMA_2) == dma_idx) { |
---|
57 | | - fc->write_ibi_reg(fc,dma2_010,v0x0); |
---|
58 | | - fc->write_ibi_reg(fc,dma2_014,v0x4); |
---|
59 | | - fc->write_ibi_reg(fc,dma2_01c,v0xc); |
---|
| 58 | + fc->write_ibi_reg(fc, dma2_010, v0x0); |
---|
| 59 | + fc->write_ibi_reg(fc, dma2_014, v0x4); |
---|
| 60 | + fc->write_ibi_reg(fc, dma2_01c, v0xc); |
---|
60 | 61 | } else { |
---|
61 | | - err("either DMA1 or DMA2 can be configured within one flexcop_dma_config call."); |
---|
| 62 | + err("either DMA1 or DMA2 can be configured within one %s call.", |
---|
| 63 | + __func__); |
---|
62 | 64 | return -EINVAL; |
---|
63 | 65 | } |
---|
64 | 66 | |
---|
.. | .. |
---|
72 | 74 | flexcop_dma_addr_index_t index, |
---|
73 | 75 | int onoff) |
---|
74 | 76 | { |
---|
75 | | - flexcop_ibi_value v0x0,v0xc; |
---|
76 | | - flexcop_ibi_register r0x0,r0xc; |
---|
| 77 | + flexcop_ibi_value v0x0, v0xc; |
---|
| 78 | + flexcop_ibi_register r0x0, r0xc; |
---|
77 | 79 | |
---|
78 | 80 | if ((dma_idx & FC_DMA_1) == dma_idx) { |
---|
79 | 81 | r0x0 = dma1_000; |
---|
.. | .. |
---|
82 | 84 | r0x0 = dma2_010; |
---|
83 | 85 | r0xc = dma2_01c; |
---|
84 | 86 | } else { |
---|
85 | | - err("either transfer DMA1 or DMA2 can be started within one flexcop_dma_xfer_control call."); |
---|
| 87 | + err("transfer DMA1 or DMA2 can be started within one %s call.", |
---|
| 88 | + __func__); |
---|
86 | 89 | return -EINVAL; |
---|
87 | 90 | } |
---|
88 | 91 | |
---|
89 | | - v0x0 = fc->read_ibi_reg(fc,r0x0); |
---|
90 | | - v0xc = fc->read_ibi_reg(fc,r0xc); |
---|
| 92 | + v0x0 = fc->read_ibi_reg(fc, r0x0); |
---|
| 93 | + v0xc = fc->read_ibi_reg(fc, r0xc); |
---|
91 | 94 | |
---|
92 | | - deb_rdump("reg: %03x: %x\n",r0x0,v0x0.raw); |
---|
93 | | - deb_rdump("reg: %03x: %x\n",r0xc,v0xc.raw); |
---|
| 95 | + deb_rdump("reg: %03x: %x\n", r0x0, v0x0.raw); |
---|
| 96 | + deb_rdump("reg: %03x: %x\n", r0xc, v0xc.raw); |
---|
94 | 97 | |
---|
95 | 98 | if (index & FC_DMA_SUBADDR_0) |
---|
96 | 99 | v0x0.dma_0x0.dma_0start = onoff; |
---|
.. | .. |
---|
98 | 101 | if (index & FC_DMA_SUBADDR_1) |
---|
99 | 102 | v0xc.dma_0xc.dma_1start = onoff; |
---|
100 | 103 | |
---|
101 | | - fc->write_ibi_reg(fc,r0x0,v0x0); |
---|
102 | | - fc->write_ibi_reg(fc,r0xc,v0xc); |
---|
| 104 | + fc->write_ibi_reg(fc, r0x0, v0x0); |
---|
| 105 | + fc->write_ibi_reg(fc, r0xc, v0xc); |
---|
103 | 106 | |
---|
104 | | - deb_rdump("reg: %03x: %x\n",r0x0,v0x0.raw); |
---|
105 | | - deb_rdump("reg: %03x: %x\n",r0xc,v0xc.raw); |
---|
| 107 | + deb_rdump("reg: %03x: %x\n", r0x0, v0x0.raw); |
---|
| 108 | + deb_rdump("reg: %03x: %x\n", r0xc, v0xc.raw); |
---|
106 | 109 | return 0; |
---|
107 | 110 | } |
---|
108 | 111 | EXPORT_SYMBOL(flexcop_dma_xfer_control); |
---|
.. | .. |
---|
112 | 115 | int onoff) |
---|
113 | 116 | { |
---|
114 | 117 | flexcop_ibi_register r = (dma_idx & FC_DMA_1) ? dma1_00c : dma2_01c; |
---|
115 | | - flexcop_ibi_value v = fc->read_ibi_reg(fc,r); |
---|
116 | | - deb_info("%s\n",__func__); |
---|
| 118 | + flexcop_ibi_value v = fc->read_ibi_reg(fc, r); |
---|
| 119 | + |
---|
| 120 | + deb_info("%s\n", __func__); |
---|
117 | 121 | v.dma_0xc.remap_enable = onoff; |
---|
118 | | - fc->write_ibi_reg(fc,r,v); |
---|
| 122 | + fc->write_ibi_reg(fc, r, v); |
---|
119 | 123 | return 0; |
---|
120 | 124 | } |
---|
121 | 125 | |
---|
.. | .. |
---|
123 | 127 | flexcop_dma_index_t no, |
---|
124 | 128 | int onoff) |
---|
125 | 129 | { |
---|
126 | | - flexcop_ibi_value v = fc->read_ibi_reg(fc,ctrl_208); |
---|
| 130 | + flexcop_ibi_value v = fc->read_ibi_reg(fc, ctrl_208); |
---|
127 | 131 | |
---|
128 | 132 | if (no & FC_DMA_1) |
---|
129 | 133 | v.ctrl_208.DMA1_IRQ_Enable_sig = onoff; |
---|
.. | .. |
---|
131 | 135 | if (no & FC_DMA_2) |
---|
132 | 136 | v.ctrl_208.DMA2_IRQ_Enable_sig = onoff; |
---|
133 | 137 | |
---|
134 | | - fc->write_ibi_reg(fc,ctrl_208,v); |
---|
| 138 | + fc->write_ibi_reg(fc, ctrl_208, v); |
---|
135 | 139 | return 0; |
---|
136 | 140 | } |
---|
137 | 141 | EXPORT_SYMBOL(flexcop_dma_control_size_irq); |
---|
.. | .. |
---|
140 | 144 | flexcop_dma_index_t no, |
---|
141 | 145 | int onoff) |
---|
142 | 146 | { |
---|
143 | | - flexcop_ibi_value v = fc->read_ibi_reg(fc,ctrl_208); |
---|
| 147 | + flexcop_ibi_value v = fc->read_ibi_reg(fc, ctrl_208); |
---|
144 | 148 | |
---|
145 | 149 | if (no & FC_DMA_1) |
---|
146 | 150 | v.ctrl_208.DMA1_Timer_Enable_sig = onoff; |
---|
.. | .. |
---|
148 | 152 | if (no & FC_DMA_2) |
---|
149 | 153 | v.ctrl_208.DMA2_Timer_Enable_sig = onoff; |
---|
150 | 154 | |
---|
151 | | - fc->write_ibi_reg(fc,ctrl_208,v); |
---|
| 155 | + fc->write_ibi_reg(fc, ctrl_208, v); |
---|
152 | 156 | return 0; |
---|
153 | 157 | } |
---|
154 | 158 | EXPORT_SYMBOL(flexcop_dma_control_timer_irq); |
---|
.. | .. |
---|
158 | 162 | flexcop_dma_index_t dma_idx, u8 cycles) |
---|
159 | 163 | { |
---|
160 | 164 | flexcop_ibi_register r = (dma_idx & FC_DMA_1) ? dma1_004 : dma2_014; |
---|
161 | | - flexcop_ibi_value v = fc->read_ibi_reg(fc,r); |
---|
| 165 | + flexcop_ibi_value v = fc->read_ibi_reg(fc, r); |
---|
162 | 166 | |
---|
163 | | - flexcop_dma_remap(fc,dma_idx,0); |
---|
| 167 | + flexcop_dma_remap(fc, dma_idx, 0); |
---|
164 | 168 | |
---|
165 | | - deb_info("%s\n",__func__); |
---|
| 169 | + deb_info("%s\n", __func__); |
---|
166 | 170 | v.dma_0x4_write.dmatimer = cycles; |
---|
167 | | - fc->write_ibi_reg(fc,r,v); |
---|
| 171 | + fc->write_ibi_reg(fc, r, v); |
---|
168 | 172 | return 0; |
---|
169 | 173 | } |
---|
170 | 174 | EXPORT_SYMBOL(flexcop_dma_config_timer); |
---|