Mercurial > archived > louis > epitech > mq > rathaxes

annotate rathaxes_rewrite_create_and_destroy_device_in_the_e1000_sample.patch @ 96:3e715b3e0ecd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Start a series to cleanup/refactor the e1000 sample a little bit
author Louis Opter <louis@lse.epita.fr>
date Sun, 18 Nov 2012 02:19:07 +0100
parents
children ffdb018893e2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
96
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
1 # HG changeset patch
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
2 # Parent a7ba4e6eae2c9086c0b9876494165bf21ad1f405
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
3 rathaxes: rewrite the {create,destroy}_device functions in the e1000 sample
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
4
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
5 diff --git a/rathaxes/samples/e1000/e1000.blt b/rathaxes/samples/e1000/e1000.blt
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
6 --- a/rathaxes/samples/e1000/e1000.blt
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
7 +++ b/rathaxes/samples/e1000/e1000.blt
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
8 @@ -1,4 +1,4 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
9 -with e1000, Ethernet, Socket, PCI, LKM, Log
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
10 +with e1000, Ethernet, Socket, PCI, LKM, Log, Builtin
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
11 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
12 template type e1000::RxDescriptor()
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
13 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
14 @@ -288,7 +288,7 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
15 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
16 int bars;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
17 unsigned char /* __iomem */ *ioaddr;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
18 - int irq;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
19 + unsigned int irq;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
20
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
21 /* we can't use the Rathaxes type here (#8) */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
22 //${e1000::RxRing} rx_ring;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
23 @@ -298,8 +298,11 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
24 };
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
25 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
26
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
27 - chunk ::init()
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
28 + chunk ::init(Builtin::number bars, Builtin::number ioaddr, Builtin::number irq)
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
29 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
30 + ${self}->bars = ${bars};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
31 + ${self}->ioaddr = ${ioaddr};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
32 + ${self}->irq = irq;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
33 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
34
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
35 map
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
36 @@ -479,40 +482,16 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
37
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
38 template sequence e1000::create_device()
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
39 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
40 - chunk Ethernet::create_device(PCI::AbstractDevice pdev, Ethernet::Device rtx_ether_ctx)
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
41 + chunk Ethernet::create_device(Ethernet::Device rtx_ether_ctx,
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
42 + Builtin::number bars,
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
43 + Builtin::number ioaddr,
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
44 + Builtin::number irq)
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
45 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
46 - /*
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
47 - * PCI init stuff:
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
48 - *
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
49 - * Some of that code should certainly be moved in the PCI/Ethernet
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
50 - * blts, also at some point maybe we could do that completely
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
51 - * automatically in the PCI/Ethernet blts.
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
52 - */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
53 + /* XXX: Use the rathaxes type directly here (#51): */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
54 + struct rtx_e1000_ctx *hw_ctx = &${rtx_ether_ctx}->hw_ctx;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
55 + ${cast local.hw_ctx as e1000::Context};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
56
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
57 - /*
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
58 - * We could have used an init function here but since we can't init
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
59 - * all the fields at once (see, ioaddr) and cannot call a C
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
60 - * function within a placeholder (${}), it wasn't really worth it.
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
61 - */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
62 - ${rtx_ether_ctx}->hw_ctx.bars = pci_select_bars(${pdev}, IORESOURCE_MEM);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
63 - ${rtx_ether_ctx}->hw_ctx.irq = ${pdev}->irq;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
64 -
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
65 - if (pci_enable_device_mem(${pdev}))
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
66 - ${Log::info("e1000::create: pci_enable_device_mem failed")};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
67 - if (pci_request_selected_regions(${pdev}, ${rtx_ether_ctx}->hw_ctx.bars, ${config.name}))
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
68 - ${Log::info("e1000::create: pci_request_selected_regions failed")};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
69 - if (${config.set_master})
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
70 - pci_set_master(${pdev});
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
71 -
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
72 - /* 0 here is for BAR_0: */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
73 - ${rtx_ether_ctx}->hw_ctx.ioaddr = pci_ioremap_bar(${pdev}, 0);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
74 - if (!${rtx_ether_ctx}->hw_ctx.ioaddr)
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
75 - ${Log::info("e1000::create: pci_ioremap_bar failed")};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
76 -
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
77 - /*
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
78 - * The really device specific algorithm starts here (so it should
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
79 - * certainly be written in the frontend):
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
80 - */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
81 + ${local.hw_ctx.init(bars, ioaddr, irq)};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
82
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
83 /* Reset the card */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
84 rtx_e1000_register_write32(&${rtx_ether_ctx}->hw_ctx, E1000_CTRL, E1000_CMD_RST);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
85 @@ -533,6 +512,7 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
86 ${rtx_ether_ctx}->net_dev->dev_addr[i * 2 + 1] = (value >> 8) & 0xff;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
87 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
88
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
89 + /* XXX: use ${rtx_ether_ctx.set_mac_address()}; : */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
90 memcpy(${rtx_ether_ctx}->net_dev->perm_addr,
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
91 ${rtx_ether_ctx}->net_dev->dev_addr,
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
92 ${rtx_ether_ctx}->net_dev->addr_len);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
93 diff --git a/rathaxes/samples/e1000/e1000.rti b/rathaxes/samples/e1000/e1000.rti
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
94 --- a/rathaxes/samples/e1000/e1000.rti
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
95 +++ b/rathaxes/samples/e1000/e1000.rti
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
96 @@ -1,8 +1,5 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
97 interface e1000 : Socket, Ethernet, PCI, LKM, Builtin
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
98 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
99 - /* XXX: This should be in pci.rti, also maybe we need a bool type */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
100 - required variable Builtin::symbol set_master;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
101 -
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
102 required variable Builtin::number rx_ring_size;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
103 required variable Builtin::number tx_ring_size;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
104 required variable Builtin::number rx_buffer_len;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
105 @@ -12,7 +9,8 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
106 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
107 chunk Ethernet::SubContext();
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
108 method decl();
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
109 - method init();
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
110 + /* XXX: used types: */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
111 + method init(Builtin::number, Builtin::number, Builtin::number);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
112 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
113
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
114 provided type RxDescriptor
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
115 diff --git a/rathaxes/samples/e1000/ethernet.blt b/rathaxes/samples/e1000/ethernet.blt
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
116 --- a/rathaxes/samples/e1000/ethernet.blt
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
117 +++ b/rathaxes/samples/e1000/ethernet.blt
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
118 @@ -111,6 +111,13 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
119 ${self}->net_dev = ${net_dev};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
120 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
121
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
122 + chunk set_mac_address(Builtin::number addr)
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
123 + {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
124 + memcpy(${self}->net_dev->perm_addr,
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
125 + ${self}->net_dev->dev_addr,
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
126 + ${self}->net_dev->addr_len);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
127 + }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
128 +
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
129 map
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
130 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
131 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
132 @@ -249,9 +256,26 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
133 /* Initialize our context held by the net_device structure */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
134 ${rtx_ether_ctx.init(local.net_dev, pdev)};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
135
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
136 + /* XXX: The following code should probably part of PCI:: */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
137 +
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
138 pci_set_drvdata(${pdev}, net_dev);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
139
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
140 - ${pointcut Ethernet::create_device(pdev, local.rtx_ether_ctx)};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
141 + int bars = pci_select_bars(${pdev}, IORESOURCE_MEM);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
142 +
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
143 + if (pci_enable_device_mem(${pdev}))
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
144 + ${Log::info("pci_enable_device_mem failed")};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
145 + if (pci_request_selected_regions(${pdev}, bars, ${config.name}))
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
146 + ${Log::info("pci_request_selected_regions failed")};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
147 + if (${config.set_master})
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
148 + pci_set_master(${pdev});
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
149 +
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
150 + /* 0 here is for BAR_0: */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
151 + unsigned char /* __iomem */ *ioaddr = pci_ioremap_bar(${pdev}, 0);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
152 + if (!ioaddr)
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
153 + ${Log::info("pci_ioremap_bar failed")};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
154 +
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
155 + unsigned int irq = net_dev->irq;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
156 + ${pointcut Ethernet::create_device(local.rtx_ether_ctx, local.bars, local.ioaddr, local.irq)};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
157 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
158
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
159 /* This chunk should be removed (see #26) */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
160 diff --git a/rathaxes/samples/e1000/ethernet.rti b/rathaxes/samples/e1000/ethernet.rti
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
161 --- a/rathaxes/samples/e1000/ethernet.rti
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
162 +++ b/rathaxes/samples/e1000/ethernet.rti
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
163 @@ -1,5 +1,8 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
164 -interface Ethernet : Socket, PCI, LKM
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
165 +interface Ethernet : Socket, PCI, LKM, Builtin
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
166 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
167 + /* XXX: This should be in pci.rti, also maybe we need a bool type */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
168 + required variable Builtin::symbol set_master;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
169 +
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
170 required variable Builtin::string ifname;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
171
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
172 provided type ProtocolId
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
173 @@ -22,6 +25,8 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
174 chunk LKM::includes();
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
175 method decl();
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
176 method init(Ethernet::AbstractDevice, PCI::AbstractDevice);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
177 + method set_mac_address(Builtin::number);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
178 +
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
179 pointcut Ethernet::SubContext();
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
180 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
181
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
182 @@ -54,7 +59,10 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
183 provided chunk LKM::data();
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
184 provided chunk PCI::pci_probe_hook(PCI::AbstractDevice);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
185
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
186 - provided pointcut Ethernet::create_device(PCI::AbstractDevice, Ethernet::Device);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
187 + provided pointcut Ethernet::create_device(Ethernet::Device,
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
188 + Builtin::number,
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
189 + Builtin::number,
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
190 + Builtin::number);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
191 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
192
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
193 provided sequence exit()