Mercurial > archived > louis > epitech > mq > rathaxes
annotate rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch @ 65:e77a4126576c
WIP e1000 sample
| author | Louis Opter <louis@lse.epitech.net> |
|---|---|
| date | Sat, 18 Feb 2012 15:25:42 +0100 |
| parents | 8dc1a3bf372a |
| children | b916396fc577 |
| rev | line source |
|---|---|
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
1 # HG changeset patch |
| 64 | 2 # Parent e24ae3e49b73a2b799765d863f69f0c956ea2c54 |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
3 # User Louis Opter <louis@lse.epitech.net>, David Pineau <dav.pineau@gmail.com> |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
4 rathaxes: correctly use chunk and template sequences parameters in the e1000 sample |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
5 |
| 63 | 6 diff --git a/rathaxes/samples/e1000/e1000.blt b/rathaxes/samples/e1000/e1000.blt |
| 7 --- a/rathaxes/samples/e1000/e1000.blt | |
| 8 +++ b/rathaxes/samples/e1000/e1000.blt | |
| 9 @@ -15,18 +15,20 @@ | |
| 10 | |
| 11 chunk ::decl() | |
| 12 { | |
| 13 - struct rtx_e1000_ctx | |
| 14 + /* | |
| 15 + * Yes, this typedef looks ugly but read the remark about | |
| 16 + * Ethernet::Device in ethernet.blt. | |
| 17 + */ | |
| 18 + typedef struct rtx_e1000_ctx | |
| 19 { | |
| 20 int bars; | |
| 21 unsigned char /* __iomem */ *ioaddr; | |
| 22 int irq; | |
| 23 - }; | |
| 24 + } *rtx_e1000_ctx_p; | |
| 25 } | |
| 26 | |
| 27 - chunk ::init(bars, ioaddr) | |
| 28 + chunk ::init() | |
| 29 { | |
| 30 - ${self}.bars = ${bars}; | |
| 31 - ${self}.ioaddr = ${ioaddr}; | |
| 32 } | |
| 33 | |
| 34 map | |
| 35 @@ -136,58 +138,74 @@ | |
| 36 | |
| 37 template sequence e1000::create_device() | |
| 38 { | |
| 39 - chunk Ethernet::create_device() | |
| 40 + chunk Ethernet::create_device(/* PCI::Device */ pdev, /* Ethernet::Device */ rtx_ether_ctx) | |
| 41 { | |
| 42 - rtx_ether_ctx->hw_ctx.irq = pdev->irq; | |
| 43 - rtx_ether_ctx->hw_ctx.bars = pci_select_bars(pdev, IORESOURCE_MEM); | |
| 44 - if (pci_enable_device_mem(pdev)) | |
| 45 + /* | |
| 46 + * PCI init stuff: | |
| 47 + * | |
| 48 + * Some of that code should be moved in the PCI blts, also at some | |
| 49 + * point maybe we could do that completely automatically in the PCI | |
| 50 + * blts. | |
| 51 + */ | |
| 52 + | |
| 53 + /* | |
| 54 + * We could have used an init function here but since we can't init | |
| 55 + * all the fields at once (see, ioaddr) and cannot call a C | |
| 56 + * function within a placeholder (${}), it wasn't really worth it. | |
| 57 + */ | |
| 64 | 58 + ${rtx_ether_ctx}->hw_ctx.bars = pci_select_bars(${pdev}, IORESOURCE_MEM); |
| 59 + ${rtx_ether_ctx}->hw_ctx.irq = ${pdev}->irq; | |
| 63 | 60 + |
| 61 + if (pci_enable_device_mem(${pdev})) | |
| 62 { | |
| 63 ${Log::info("e1000::create: pci_enable_device_mem failed")}; | |
| 64 } | |
| 65 - | |
| 66 - if (pci_request_selected_regions(pdev, rtx_ether_ctx->hw_ctx.bars, ${config.name})) | |
| 67 + if (pci_request_selected_regions(${pdev}, ${rtx_ether_ctx}->hw_ctx.bars, ${config.name})) | |
| 68 { | |
| 69 ${Log::info("e1000::create: pci_request_selected_regions failed")}; | |
| 70 } | |
| 71 - | |
| 72 if (${config.set_master}) | |
| 73 { | |
| 74 - pci_set_master(pdev); | |
| 75 + pci_set_master(${pdev}); | |
| 76 } | |
| 77 | |
| 78 /* 0 here is for BAR_0: */ | |
| 79 - rtx_ether_ctx->hw_ctx.ioaddr = pci_ioremap_bar(pdev, 0); | |
| 80 - if (!rtx_ether_ctx->hw_ctx.ioaddr) | |
| 81 + ${rtx_ether_ctx}->hw_ctx.ioaddr = pci_ioremap_bar(${pdev}, 0); | |
| 82 + if (!${rtx_ether_ctx}->hw_ctx.ioaddr) | |
| 83 { | |
| 84 ${Log::info("e1000::create: pci_ioremap_bar failed")}; | |
| 85 } | |
| 86 | |
| 87 + /* | |
| 88 + * The really device specific algorithm starts here (so it should | |
| 89 + * certainly be written in the frontend): | |
| 90 + */ | |
| 91 + | |
| 92 /* Reset the card */ | |
| 93 - rtx_e1000_register_write32(&rtx_ether_ctx->hw_ctx, E1000_CTRL, E1000_CMD_RST); | |
| 94 + rtx_e1000_register_write32(&${rtx_ether_ctx}->hw_ctx, E1000_CTRL, E1000_CMD_RST); | |
| 95 udelay(10); | |
| 96 | |
| 97 - /* Now we can load its mac address */ | |
| 98 + /* Now we can load its mac address (thanks minix code) */ | |
| 99 int i = 0; | |
| 100 - for (i = 0 /* < this is not generated! */; i < 3; ++i) | |
| 101 + for (i = 0 /* < this is not generated! (cnorm bug) */; i < 3; ++i) | |
| 102 { | |
| 103 - rtx_e1000_register_write32(&rtx_ether_ctx->hw_ctx, E1000_EEPROM_READ, (i << 8) | 1); | |
| 104 + rtx_e1000_register_write32(&${rtx_ether_ctx}->hw_ctx, E1000_EEPROM_READ, (i << 8) | 1); | |
| 105 | |
| 106 int value; | |
| 107 - /* Should be a do { } while(); but the compiler doesn't do { } while(); yet. */ | |
| 108 - value = rtx_e1000_register_read32(&rtx_ether_ctx->hw_ctx, E1000_EEPROM_READ); | |
| 109 - while ((value & (1 << 4)) == 0) | |
| 110 - value = rtx_e1000_register_read32(&rtx_ether_ctx->hw_ctx, E1000_EEPROM_READ); | |
| 111 + do | |
| 112 + value = rtx_e1000_register_read32(&${rtx_ether_ctx}->hw_ctx, E1000_EEPROM_READ); | |
| 113 + while ((value & (1 << 4)) == 0); | |
| 114 value >>= 16; | |
| 115 | |
| 116 - rtx_ether_ctx->net_dev->dev_addr[i * 2] = value & 0xff; | |
| 117 - rtx_ether_ctx->net_dev->dev_addr[i * 2 + 1] = (value >> 8) & 0xff; | |
| 118 + ${rtx_ether_ctx}->net_dev->dev_addr[i * 2] = value & 0xff; | |
| 119 + ${rtx_ether_ctx}->net_dev->dev_addr[i * 2 + 1] = (value >> 8) & 0xff; | |
| 120 } | |
| 121 | |
| 122 - memcpy(rtx_ether_ctx->net_dev->perm_addr, | |
| 123 - rtx_ether_ctx->net_dev->dev_addr, | |
| 124 - rtx_ether_ctx->net_dev->addr_len); | |
| 125 + memcpy(${rtx_ether_ctx}->net_dev->perm_addr, | |
| 126 + ${rtx_ether_ctx}->net_dev->dev_addr, | |
| 127 + ${rtx_ether_ctx}->net_dev->addr_len); | |
| 128 | |
| 129 - { /* < mais lol. */ | |
| 130 + { /* < See #10 */ | |
| 131 ${Log::info("e1000::create: mac address loaded from the EEPROM")}; | |
| 132 } | |
| 133 } | |
| 134 @@ -199,15 +217,14 @@ | |
| 135 | |
| 136 template sequence e1000::destroy_device() | |
| 137 { | |
| 138 - chunk Ethernet::destroy_device | |
| 139 + chunk Ethernet::destroy_device(/* PCI::Device */ pdev, /* Ethernet::Device */ rtx_ether_ctx) | |
| 140 { | |
| 141 /* | |
| 142 * Here, we should have some checks to avoid to free resources that | |
| 143 * haven't been allocated. (e.g: in case of previous errors). | |
| 144 */ | |
| 145 - struct rtx_ethernet_dev* rtx_ether_ctx = netdev_priv(net_dev); | |
| 146 - iounmap(rtx_ether_ctx->hw_ctx.ioaddr); | |
| 147 - pci_release_selected_regions(pdev, rtx_ether_ctx->hw_ctx.bars); | |
| 148 + iounmap(${rtx_ether_ctx}->hw_ctx.ioaddr); | |
| 149 + pci_release_selected_regions(${pdev}, ${rtx_ether_ctx}->hw_ctx.bars); | |
| 150 } | |
| 151 | |
| 152 chunk ::CALL | |
| 65 | 153 @@ -227,7 +244,7 @@ |
| 154 static void rtx_e1000_print_status(struct rtx_e1000_ctx *ctx) | |
| 155 { | |
| 156 unsigned int status = rtx_e1000_register_read32(ctx, E1000_STATUS); | |
| 157 - pr_info("rtx_e1000 status: \n"); | |
| 158 + pr_info("card status: \n"); | |
| 159 pr_info("\tRegister value: 0x%x\n", status); | |
| 160 pr_info("\tMode: %s\n", (status & 1) ? "Full": "Half"); | |
| 161 pr_info("\tLink: %s\n", (status & 2) ? "Up" : "Down"); | |
| 63 | 162 @@ -275,7 +292,7 @@ |
| 163 | |
| 164 chunk ::CALL() | |
| 165 { | |
| 166 - rtx_e1000_register_read32(&${ctx}, ${reg_offset}); | |
| 167 + rtx_e1000_register_read32(${ctx}, ${reg_offset}); | |
| 168 } | |
| 169 } | |
| 170 | |
| 171 @@ -296,7 +313,7 @@ | |
| 172 | |
| 173 chunk ::CALL() | |
| 174 { | |
| 175 - rtx_e1000_register_write32(&${ctx}, ${reg_offset}); | |
| 176 + rtx_e1000_register_write32(${ctx}, ${reg_offset}); | |
| 177 } | |
| 178 } | |
| 179 | |
| 180 @@ -320,7 +337,7 @@ | |
| 181 } | |
| 182 } | |
| 183 | |
| 184 - template sequence e1000::setup_interrupt_handler() | |
| 185 + template sequence e1000::setup_interrupt_handler(Ethernet::Device ctx) | |
| 186 { | |
| 187 chunk LKM::includes() | |
| 188 { | |
| 65 | 189 @@ -345,20 +362,20 @@ |
| 190 | |
| 191 if (error) | |
| 192 { | |
| 193 - ${Log::info("Cannot register the interruption")}; | |
| 194 + ${Log::info("cannot register the interrupt handler")}; | |
| 195 } | |
| 196 | |
| 197 return error; | |
| 63 | 198 } |
| 199 } | |
| 200 | |
| 201 - chunk ::CALL() | |
| 202 + chunk ::CALL | |
| 203 { | |
| 204 // this is an hack for the scope | |
| 205 (void)1; | |
| 206 { | |
| 207 int error; | |
| 208 - error = e1000_setup_interrupt_handler(rtx_ether_dev); | |
| 209 + error = e1000_setup_interrupt_handler(${ctx}); | |
| 210 if (error) | |
| 211 { | |
| 212 return error; | |
| 65 | 213 @@ -423,7 +440,7 @@ |
| 214 intr = rtx_e1000_register_read32(ctx, E1000_ICR); | |
| 215 if (intr & E1000_INTR_LSC) | |
| 216 { | |
| 217 - ${Log::info("Link status changed")}; | |
| 218 + ${Log::info("cable link status changed")}; | |
| 219 } | |
| 220 | |
| 221 if (intr) | |
| 63 | 222 diff --git a/rathaxes/samples/e1000/e1000.rti b/rathaxes/samples/e1000/e1000.rti |
| 223 --- a/rathaxes/samples/e1000/e1000.rti | |
| 224 +++ b/rathaxes/samples/e1000/e1000.rti | |
| 225 @@ -1,25 +1,22 @@ | |
| 226 interface e1000 : Socket, Ethernet, PCI, LKM | |
| 227 { | |
| 228 provided type e1000::Context; | |
| 229 + /* | |
| 230 + * These two types should actually be registers definitions in the frontend: | |
| 231 + */ | |
| 232 provided type e1000::Register; | |
| 233 provided type e1000::Commands; | |
| 234 | |
| 235 - /* | |
| 236 - * This sequence should receive an argument like Ethernet::Device, but it is | |
| 237 - * unclear about how this argument should be bound to a variable/argument in | |
| 238 - * the instrumented C code. | |
| 239 - * | |
| 240 - * Here again, we rely on the fact that *we* wrote the parent context and | |
| 241 - * named the C variables we need/use with the same name everywhere. | |
| 242 - */ | |
| 243 provided sequence e1000::create_device() | |
| 244 { | |
| 245 + /* should take PCI::Device and Ethernet::Device args: */ | |
| 246 provided chunk Ethernet::create_device; | |
| 247 provided chunk ::CALL; | |
| 248 } | |
| 249 | |
| 250 provided sequence e1000::destroy_device() | |
| 251 { | |
| 252 + /* should take PCI::Device and Ethernet::Device args: */ | |
| 253 provided chunk Ethernet::destroy_device; | |
| 254 provided chunk ::CALL; | |
| 255 } | |
| 256 @@ -35,9 +32,9 @@ | |
| 257 provided chunk ::CALL; | |
| 258 } | |
| 259 | |
| 260 - provided sequence e1000::setup_interrupt_handler() | |
| 261 + provided sequence e1000::setup_interrupt_handler(Ethernet::Device) | |
| 262 { | |
| 263 - provided chunk LKM::includes; // work without this one | |
| 264 + provided chunk LKM::includes; // works without this one | |
| 265 provided chunk LKM::prototypes; | |
| 266 provided chunk LKM::code; | |
| 267 provided chunk ::CALL; | |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
268 diff --git a/rathaxes/samples/e1000/ethernet.blt b/rathaxes/samples/e1000/ethernet.blt |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
269 --- a/rathaxes/samples/e1000/ethernet.blt |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
270 +++ b/rathaxes/samples/e1000/ethernet.blt |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
271 @@ -1,5 +1,10 @@ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
272 with Ethernet, PCI, LKM, Log |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
273 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
274 + /* |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
275 + * Unlike PCI::Device, Ethernet::Device doesn't match the struct net_device |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
276 + * from Linux. Ethernet::Device is the type that we use in the private |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
277 + * field of the struct net_device. |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
278 + */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
279 template type Ethernet::Device() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
280 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
281 chunk LKM::includes() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
282 @@ -10,7 +15,14 @@ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
283 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
284 chunk ::decl() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
285 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
286 - struct rtx_ethernet_dev |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
287 + /* |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
288 + * So, at first sight, it sucks to typedef it as pointer but (for |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
289 + * now) it makes sense for two reasons: |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
290 + * - This structure will always be used through a pointer; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
291 + * - This remove the ambiguity of pointer/not-pointer in the |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
292 + * ::init() chunk. |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
293 + */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
294 + typedef struct rtx_ethernet_dev |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
295 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
296 /* |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
297 * I think it's useless to use the ${PCI::Device} "abstraction" |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
298 @@ -21,12 +33,18 @@ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
299 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
300 /* while waiting on issue #8 */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
301 struct rtx_e1000_ctx hw_ctx; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
302 - }; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
303 + } *rtx_ethernet_dev_p; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
304 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
305 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
306 - chunk ::init(net_dev) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
307 + chunk ::init(net_dev, pci_dev) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
308 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
309 - ${self} = ${net_dev}; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
310 + ${self} = netdev_priv(${net_dev}); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
311 + /* |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
312 + * We can use -> because we know that ${self} will be always a |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
313 + * pointer ("thanks" to the typedef) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
314 + */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
315 + ${self}->pci_dev = ${pci_dev}; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
316 + ${self}->net_dev = ${net_dev}; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
317 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
318 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
319 map |
| 64 | 320 @@ -45,10 +63,10 @@ |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
321 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
322 static int rtx_ethernet_open(struct net_device *dev) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
323 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
324 - struct rtx_ethernet_dev* rtx_ether_dev = netdev_priv(dev); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
325 + struct rtx_ethernet_dev* rtx_ether_dev = netdev_priv(dev); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
326 struct rtx_e1000_ctx* ctx = &rtx_ether_dev->hw_ctx; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
327 |
| 64 | 328 - ${pointcut ::IMPLEMENTATION}; |
| 329 + ${pointcut ::IMPLEMENTATION(local.rtx_ethernet_dev)}; | |
| 330 | |
| 331 return 0; | |
| 332 } | |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
333 @@ -121,7 +139,7 @@ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
334 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
335 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
336 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
337 - template sequence Ethernet::init(PCI::Device pdev) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
338 + template sequence Ethernet::init() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
339 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
340 chunk LKM::data() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
341 { |
| 65 | 342 @@ -133,83 +151,75 @@ |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
343 }; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
344 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
345 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
346 - chunk PCI::pci_probe_hook() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
347 + /* For now the type is not handled, so we just omit it (see #17) */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
348 + chunk PCI::pci_probe_hook(/* PCI::Device */ pdev) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
349 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
350 /* |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
351 * This typedef is needed to workaround a bug in CNorm __std__ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
352 * dialect. |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
353 */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
354 typedef int ${Ethernet::Device}; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
355 - ${Ethernet::Device} *rtx_ether_ctx; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
356 - struct net_device *net_dev; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
357 + |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
358 + ${Ethernet::Device} rtx_ether_ctx; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
359 + struct net_device *net_dev; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
360 int error; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
361 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
362 - error = 0; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
363 + /* Initialize the net_device structure */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
364 net_dev = alloc_etherdev(sizeof(*rtx_ether_ctx)); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
365 if (net_dev == 0) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
366 { |
| 65 | 367 - ${Log::info("Cannot allocate memory")}; |
| 368 + ${Log::info("cannot allocate memory")}; | |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
369 /* |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
370 * Again, the error should be "raised" in the parent context. |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
371 * |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
372 - * Here we know that we should return ENOMEM because *we* wrote |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
373 + * Here we know that we can return ENOMEM because *we* wrote |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
374 * the parent context. |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
375 */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
376 return -ENOMEM; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
377 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
378 + SET_NETDEV_DEV(net_dev, &${pdev}->dev); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
379 strlcpy(net_dev->name, ${config.ifname}, sizeof(net_dev->name)); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
380 - net_dev->irq = pdev->irq; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
381 - // Maybe we should try ${rtx_ether_ctx.init()} here: |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
382 - rtx_ether_ctx = netdev_priv(net_dev); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
383 - //rtx_ether_ctx->pci_dev = ${pdev}; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
384 - rtx_ether_ctx->pci_dev = pdev; // In the meantime do it directly |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
385 - rtx_ether_ctx->net_dev = net_dev; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
386 + net_dev->irq = ${pdev}->irq; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
387 + net_dev->netdev_ops = &rtx_ether_ops; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
388 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
389 - /* |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
390 - * The substitution of ${pdev} fails here. I also tried to add a |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
391 - * "substitute method" to the PCI::Device that was just doing |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
392 - * "${self}" but it didn't work either (it was subsituted by a |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
393 - * placeholder, e.g: _1). |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
394 - * |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
395 - * That's why we cheated a bit and named all the arguments pdev. |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
396 - */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
397 - //SET_NETDEV_DEV(net_dev, &${pdev}->dev); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
398 - SET_NETDEV_DEV(net_dev, &pdev->dev); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
399 - net_dev->netdev_ops = &rtx_ether_ops; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
400 - if ((error = register_netdev(net_dev))) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
401 + error = register_netdev(net_dev); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
402 + if (error) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
403 { |
| 65 | 404 - ${Log::info("Cannot register the driver")}; |
| 405 + ${Log::info("cannot register the driver in the net subsystem")}; | |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
406 return error; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
407 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
408 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
409 - /* same problem as above with ${pdev} */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
410 - //pci_set_drvdata(${pdev}, net_dev); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
411 - pci_set_drvdata(pdev, net_dev); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
412 + /* Initialize our context held by the net_device structure */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
413 + ${rtx_ether_ctx.init(local.net_dev, pdev)}; |
| 63 | 414 |
| 415 - ${pointcut Ethernet::create_device}; | |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
416 + pci_set_drvdata(${pdev}, net_dev); |
| 63 | 417 + |
| 418 + ${pointcut Ethernet::create_device(pdev, local.rtx_ether_ctx)}; | |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
419 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
420 |
| 63 | 421 + /* This chunk should be removed (see #26) */ |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
422 chunk ::CALL |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
423 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
424 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
425 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
426 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
427 - template sequence Ethernet::exit(PCI::Device pdev) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
428 + template sequence Ethernet::exit() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
429 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
430 - chunk PCI::pci_remove_hook() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
431 + chunk PCI::pci_remove_hook(/* PCI::Device */ pdev) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
432 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
433 - struct net_device *net_dev = pci_get_drvdata(pdev); |
| 63 | 434 + /* workaround for cnorm unstrict */ |
| 64 | 435 + typedef int ${Ethernet::Device}; |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
436 |
| 63 | 437 - ${pointcut Ethernet::destroy_device}; |
| 438 + struct net_device *net_dev = pci_get_drvdata(${pdev}); | |
| 64 | 439 + ${Ethernet::Device} rtx_ether_ctx = netdev_priv(net_dev); |
| 63 | 440 + |
| 441 + ${pointcut Ethernet::destroy_device(pdev, local.rtx_ether_ctx)}; | |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
442 |
| 63 | 443 unregister_netdev(net_dev); |
| 444 - /* | |
| 445 - * If we had some cleanup todo with struct rtx_ether_ctx we would | |
| 446 - * do a netdev_priv(net_dev) here and do it. | |
| 447 - */ | |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
448 free_netdev(net_dev); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
449 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
450 |
| 63 | 451 + /* This chunk should be removed (see #26) */ |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
452 chunk ::CALL |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
453 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
454 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
455 diff --git a/rathaxes/samples/e1000/ethernet.rti b/rathaxes/samples/e1000/ethernet.rti |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
456 --- a/rathaxes/samples/e1000/ethernet.rti |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
457 +++ b/rathaxes/samples/e1000/ethernet.rti |
| 63 | 458 @@ -28,19 +28,17 @@ |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
459 provided chunk LKM::code; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
460 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
461 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
462 - provided sequence Ethernet::init(PCI::Device) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
463 + provided sequence Ethernet::init() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
464 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
465 provided chunk LKM::data; |
| 63 | 466 - provided chunk PCI::pci_probe_hook; |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
467 - provided chunk ::CALL; |
| 63 | 468 + provided chunk PCI::pci_probe_hook; /* should take a PCI::Device arg */ |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
469 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
470 provided pointcut Ethernet::create_device; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
471 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
472 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
473 - provided sequence Ethernet::exit(PCI::Device) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
474 + provided sequence Ethernet::exit() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
475 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
476 - provided chunk ::CALL; |
| 63 | 477 - provided chunk PCI::pci_remove_hook; |
| 478 + provided chunk PCI::pci_remove_hook; /* should take a PCI::Device arg */ | |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
479 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
480 provided pointcut Ethernet::destroy_device; |
| 63 | 481 } |
| 482 diff --git a/rathaxes/samples/e1000/lkm.rtx b/rathaxes/samples/e1000/lkm.rtx | |
| 483 --- a/rathaxes/samples/e1000/lkm.rtx | |
| 484 +++ b/rathaxes/samples/e1000/lkm.rtx | |
| 65 | 485 @@ -2,44 +2,44 @@ |
| 486 { | |
| 63 | 487 Ethernet::open(Ethernet::Device dev) |
| 488 { | |
| 65 | 489 - Log::info("Open the device"); |
| 63 | 490 - e1000::setup_interrupt_handler(); |
| 65 | 491 - Log::info("Interrupt handler installed"); |
| 492 + Log::info("open the device"); | |
| 63 | 493 + e1000::setup_interrupt_handler(dev); |
| 65 | 494 + Log::info("interrupt handler installed"); |
| 63 | 495 e1000::set_up_device(); |
| 496 e1000::activate_device_interruption(); | |
| 65 | 497 } |
| 498 | |
| 499 Ethernet::close(Ethernet::Device dev) | |
| 500 { | |
| 501 - Log::info("Close the device"); | |
| 502 + Log::info("close the device"); | |
| 503 e1000::free_interrupt_handler(); | |
| 504 } | |
| 505 | |
| 506 Ethernet::interrupt_handler(Ethernet::Device dev) | |
| 507 { | |
| 508 - Log::info("Got an interruption"); | |
| 509 + Log::info("got an interruption"); | |
| 510 e1000::handle_intr(); | |
| 511 } | |
| 512 | |
| 513 Ethernet::send(Ethernet::Device dev, Socket::SKBuff skb) | |
| 514 { | |
| 515 - Log::info("We have one packet to transmit!"); | |
| 516 + Log::info("we have one packet to transmit!"); | |
| 517 } | |
| 518 | |
| 519 LKM::init() | |
| 520 { | |
| 521 - Log::info("Hello this is LKM"); | |
| 522 + Log::info("loading module"); | |
| 523 } | |
| 524 | |
| 525 LKM::exit() | |
| 526 { | |
| 527 - Log::info("Good bye this was LKM"); | |
| 528 + Log::info("unloading module"); | |
| 529 } | |
| 530 } | |
| 531 | |
| 532 configuration | |
| 533 { | |
| 534 - LKM::name = "hello"; | |
| 535 + LKM::name = "rtx_e1k"; | |
| 536 LKM::author = "Rathaxes"; | |
| 537 LKM::description = "Hello World Loadable Kernel Module (LKM)"; | |
| 538 LKM::license = "GPL"; | |
| 539 diff --git a/rathaxes/samples/e1000/log.blt b/rathaxes/samples/e1000/log.blt | |
| 540 --- a/rathaxes/samples/e1000/log.blt | |
| 541 +++ b/rathaxes/samples/e1000/log.blt | |
| 542 @@ -4,7 +4,7 @@ | |
| 543 { | |
| 544 chunk ::CALL | |
| 545 { | |
| 546 - pr_info("%s\n", ${msg}); | |
| 547 + pr_info("%s: %s\n", ${config.name}, ${msg}); | |
| 548 } | |
| 549 } | |
| 550 } | |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
551 diff --git a/rathaxes/samples/e1000/pci.blt b/rathaxes/samples/e1000/pci.blt |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
552 --- a/rathaxes/samples/e1000/pci.blt |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
553 +++ b/rathaxes/samples/e1000/pci.blt |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
554 @@ -22,7 +22,7 @@ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
555 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
556 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
557 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
558 - template sequence PCI::probe(PCI::Device pdev) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
559 + template sequence PCI::probe() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
560 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
561 chunk LKM::prototypes() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
562 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
563 @@ -41,7 +41,8 @@ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
564 if (err < 0) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
565 goto fail; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
566 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
567 - ${pointcut PCI::pci_probe_hook}; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
568 + /* Use local. to reference a local C variable: */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
569 + ${pointcut PCI::pci_probe_hook(local.pdev)}; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
570 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
571 return 0; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
572 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
573 @@ -50,12 +51,13 @@ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
574 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
575 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
576 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
577 + /* This chunk should be remove (see #26) */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
578 chunk ::CALL |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
579 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
580 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
581 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
582 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
583 - template sequence PCI::remove(PCI::Device pdev) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
584 + template sequence PCI::remove() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
585 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
586 chunk LKM::prototypes() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
587 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
588 @@ -66,12 +68,13 @@ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
589 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
590 static void rtx_pci_remove(struct pci_dev *pdev) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
591 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
592 - ${pointcut PCI::pci_remove_hook}; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
593 + ${pointcut PCI::pci_remove_hook(local.pdev)}; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
594 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
595 pci_disable_device(pdev); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
596 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
597 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
598 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
599 + /* This chunk should be remove (see #26) */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
600 chunk ::CALL() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
601 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
602 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
603 @@ -125,6 +128,8 @@ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
604 * This sequence is just "intermediate" code that will just inject |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
605 * itself in the hook LKM::init_bus_hook for which this sequence |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
606 * has a chunk (see above chunk). |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
607 + * |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
608 + * -> Should be removed see #26 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
609 */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
610 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
611 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
612 @@ -136,6 +141,7 @@ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
613 pci_unregister_driver(&rtx_pci_driver); |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
614 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
615 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
616 + /* This chunk should be removed */ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
617 chunk ::CALL |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
618 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
619 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
620 diff --git a/rathaxes/samples/e1000/pci.rti b/rathaxes/samples/e1000/pci.rti |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
621 --- a/rathaxes/samples/e1000/pci.rti |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
622 +++ b/rathaxes/samples/e1000/pci.rti |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
623 @@ -18,7 +18,7 @@ |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
624 provided chunk LKM::deinit_bus_hook; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
625 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
626 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
627 - provided sequence PCI::probe(PCI::Device) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
628 + provided sequence PCI::probe() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
629 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
630 provided chunk LKM::prototypes; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
631 provided chunk LKM::code; |
| 63 | 632 @@ -26,11 +26,11 @@ |
|
62
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
633 provided pointcut PCI::pci_probe_hook; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
634 } |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
635 |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
636 - provided sequence PCI::remove(PCI::Device) |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
637 + provided sequence PCI::remove() |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
638 { |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
639 provided chunk LKM::prototypes; |
|
b43bed449cc2
Start a series on the e1000 sample
Louis Opter <louis@lse.epitech.net>
parents:
diff
changeset
|
640 provided chunk LKM::code; |
| 63 | 641 |
| 642 - provided pointcut PCI::pci_remove_hook; | |
| 643 + provided pointcut PCI::pci_remove_hook; /* Should take a PCI::Device arg */ | |
| 644 } | |
| 645 } |