Mercurial > archived > louis > epitech > mq > rathaxes

comparison rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch @ 69:8bb53638585b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
WIP on the e1000 sample: fix build
author Louis Opter <louis@lse.epitech.net>
date Sat, 18 Feb 2012 18:13:36 +0100
parents ef460b936b5f
children c22a9acf8cd7
comparison
equal deleted inserted replaced
68:ef460b936b5f 69:8bb53638585b
175 - rtx_e1000_register_write32(&${ctx}, ${reg_offset}); 175 - rtx_e1000_register_write32(&${ctx}, ${reg_offset});
176 + rtx_e1000_register_write32(${ctx}, ${reg_offset}); 176 + rtx_e1000_register_write32(${ctx}, ${reg_offset});
177 } 177 }
178 } 178 }
179 179
180 @@ -320,7 +337,7 @@ 180 @@ -320,12 +337,13 @@
181 } 181 }
182 } 182 }
183 183
184 - template sequence e1000::setup_interrupt_handler() 184 - template sequence e1000::setup_interrupt_handler()
185 + template sequence e1000::setup_interrupt_handler(Ethernet::Device ctx) 185 + template sequence e1000::setup_interrupt_handler(Ethernet::Device ctx)
186 { 186 {
187 chunk LKM::includes() 187 chunk LKM::includes()
188 { 188 {
189 @@ -345,20 +362,20 @@ 189 #include <linux/interrupt.h>
190 }
191 +
192 chunk LKM::prototypes()
193 {
194 static int e1000_setup_interrupt_handler(struct rtx_ethernet_dev *);
195 @@ -345,20 +363,20 @@
190 196
191 if (error) 197 if (error)
192 { 198 {
193 - ${Log::info("Cannot register the interruption")}; 199 - ${Log::info("Cannot register the interruption")};
194 + ${Log::info("cannot register the interrupt handler")}; 200 + ${Log::info("cannot register the interrupt handler")};
208 - error = e1000_setup_interrupt_handler(rtx_ether_dev); 214 - error = e1000_setup_interrupt_handler(rtx_ether_dev);
209 + error = e1000_setup_interrupt_handler(${ctx}); 215 + error = e1000_setup_interrupt_handler(${ctx});
210 if (error) 216 if (error)
211 { 217 {
212 return error; 218 return error;
213 @@ -423,7 +440,7 @@ 219 @@ -423,7 +441,7 @@
214 intr = rtx_e1000_register_read32(ctx, E1000_ICR); 220 intr = rtx_e1000_register_read32(ctx, E1000_ICR);
215 if (intr & E1000_INTR_LSC) 221 if (intr & E1000_INTR_LSC)
216 { 222 {
217 - ${Log::info("Link status changed")}; 223 - ${Log::info("Link status changed")};
218 + ${Log::info("cable link status changed")}; 224 + ${Log::info("cable link status changed")};
324 - struct rtx_ethernet_dev* rtx_ether_dev = netdev_priv(dev); 330 - struct rtx_ethernet_dev* rtx_ether_dev = netdev_priv(dev);
325 + struct rtx_ethernet_dev* rtx_ether_dev = netdev_priv(dev); 331 + struct rtx_ethernet_dev* rtx_ether_dev = netdev_priv(dev);
326 struct rtx_e1000_ctx* ctx = &rtx_ether_dev->hw_ctx; 332 struct rtx_e1000_ctx* ctx = &rtx_ether_dev->hw_ctx;
327 333
328 - ${pointcut ::IMPLEMENTATION}; 334 - ${pointcut ::IMPLEMENTATION};
329 + ${pointcut ::IMPLEMENTATION(local.rtx_ethernet_dev)}; 335 + ${pointcut ::IMPLEMENTATION(local.rtx_ether_dev)};
330 336
331 return 0; 337 return 0;
332 } 338 }
333 @@ -66,7 +84,7 @@ 339 @@ -66,7 +84,7 @@
334 { 340 {