Mercurial > archived > louis > epitech > mq > rathaxes

annotate rathaxes_samples_e1000_use_the_dma_abstraction_in_socket.patch @ 115:5a663f8f0e54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
WIP, fix another small bug in rathaxes sequence calls
author Louis Opter <louis@lse.epita.fr>
date Mon, 22 Jul 2013 13:52:00 -0700
parents 8eac160e5f1c
children f3c7e9b0c5cf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
111
b072f682823d Start a new series to refactor e1000::set_up_device
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
1 # HG changeset patch
115
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
2 # Parent 22cdd951a10d1b8b06daf6448da73e738f21d2e3
111
b072f682823d Start a new series to refactor e1000::set_up_device
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
3 Replace Linux specific code in Socket by DMA calls
b072f682823d Start a new series to refactor e1000::set_up_device
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
4
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
5 diff --git a/rathaxes/samples/e1000/socket.blt b/rathaxes/samples/e1000/socket.blt
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
6 --- a/rathaxes/samples/e1000/socket.blt
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
7 +++ b/rathaxes/samples/e1000/socket.blt
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
8 @@ -1,4 +1,4 @@
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
9 -with Socket, LKM, Device, Ethernet
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
10 +with Socket, LKM, Device, DMA, Ethernet
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
11 {
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
12 template type Socket::AbstractSKBuff()
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
13 {
115
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
14 @@ -22,35 +22,34 @@
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
15 {
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
16 decl data_types()
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
17 {
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
18 - ${Socket::AbstractSKBuff.ref} skbuff;
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
19 - dma_addr_t dma_handle;
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
20 + ${Socket::AbstractSKBuff.ref} skbuff;
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
21 + ${DMA::AbstractDMAHandle.scalar} dma_handle;
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
22 }
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
23
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
24 chunk LKM::prototypes()
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
25 {
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
26 static void rtx_socket_skbuff_dump_infos(${Socket::SKBuff.ref});
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
27 - static int rtx_socket_skbuff_map(${Socket::SKBuff.ref}, struct device *, enum dma_data_direction);
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
28 - static void rtx_socket_skbuff_unmap_and_free(${Socket::SKBuff.ref}, struct device *, enum dma_data_direction);
113
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
29 + static int rtx_socket_skbuff_map(${Socket::SKBuff.ref}, ${Device::AbstractDevice.ref}, ${DMA::DMADirection.scalar});
115
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
30 + static void rtx_socket_skbuff_unmap_and_free(${Socket::SKBuff.ref}, ${Device::AbstractDevice.ref}, ${DMA::DMADirection.scalar});
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
31 }
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
32
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
33 chunk LKM::code()
115
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
34 {
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
35 static void rtx_socket_skbuff_dump_infos(${Socket::SKBuff.ref} self)
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
36 {
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
37 - WARN_ON(!self->skbuff);
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
38 + WARN_ON(!${local.self.k_sk_buff});
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
39 +
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
40 + ${Ethernet::ProtocolId} ethernet_proto = { .id = be16_to_cpu(${local.self.k_sk_buff}->protocol) };
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
41 + static const char * const ip_summed_values[] = {
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
42 + "none", "unnecessary", "complete", "partial"
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
43 + };
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
44 + struct skb_shared_info *shinfo = skb_shinfo(${local.self.k_sk_buff});
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
45
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
46 /*
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
47 * We should use a Rathaxes log abstraction instead of pr_info here,
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
48 * but Rathaxes doesn't support functions with a variable number of
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
49 * arguments yet.
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
50 */
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
51 - ${Socket::AbstractSKBuff.ref} skb = self->skbuff;
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
52 - ${Ethernet::ProtocolId} ethernet_proto = { .id = be16_to_cpu(${local.skb.k_sk_buff}->protocol) };
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
53 - static const char * const ip_summed_values[] = {
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
54 - "none", "unnecessary", "complete", "partial"
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
55 - };
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
56 - struct skb_shared_info *shinfo = skb_shinfo(${local.skb.k_sk_buff});
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
57 -
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
58 pr_info(
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
59 "\t protocol = %#-5x (%s) ip_summed = %d (%s)\n"
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
60 "\t len = %-5u data_len = %-5u head_len = %-5u\n"
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
61 @@ -58,30 +57,26 @@
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
62 "\t gso_size = %-5u gso_segs = %-5u gso_type = %-5u",
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
63 /* XXX: can't use ${local.ethernet_proto.id} here (issue #52): */
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
64 ethernet_proto.id, ${local.ethernet_proto.str},
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
65 - ${local.skb.k_sk_buff}->ip_summed, ip_summed_values[${local.skb.k_sk_buff}->ip_summed],
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
66 - ${local.skb.k_sk_buff}->len, ${local.skb.k_sk_buff}->data_len, skb_headlen(${local.skb.k_sk_buff}),
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
67 + ${local.self.k_sk_buff}->ip_summed, ip_summed_values[${local.self.k_sk_buff}->ip_summed],
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
68 + ${local.self.k_sk_buff}->len, ${local.self.k_sk_buff}->data_len, skb_headlen(${local.self.k_sk_buff}),
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
69 shinfo->nr_frags, shinfo->gso_size, shinfo->gso_segs, shinfo->gso_type
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
70 );
113
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
71 }
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
72
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
73 static int rtx_socket_skbuff_map(${Socket::SKBuff.ref} self,
113
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
74 - struct device *dev,
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
75 - enum dma_data_direction direction)
113
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
76 + ${Device::AbstractDevice.ref} dev,
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
77 + ${DMA::DMADirection.scalar} direction)
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
78 {
113
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
79 - ${Socket::AbstractSKBuff.ref} skb = self->skbuff;
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
80 + WARN_ON(!${local.self.k_sk_buff});
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
81 + WARN_ON(${local.self.k_dma_handle});
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
82
115
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
83 - WARN_ON(!${local.skb.k_sk_buff});
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
84 - WARN_ON(self->dma_handle);
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
85 -
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
86 - self->dma_handle = dma_map_single(
113
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
87 - dev,
115
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
88 - ${local.skb.k_sk_buff},
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
89 - skb_headlen(${local.skb.k_sk_buff}),
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
90 - direction);
113
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
91 - int err = dma_mapping_error(dev, self->dma_handle);
115
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
92 + unsigned int len = skb_headlen(${local.skb.k_sk_buff});
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
93 + ${cast local.len as Builtin::number};
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
94 + ${local.self.k_dma_handle} = ${DMA::map(local.dev, local.skb.k_sk_buff, local.len, local.direction)};
113
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
95 + int err = ${DMA::mapping_error(local.dev, local.self.k_dma_handle)};
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
96 if (err)
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
97 {
113
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
98 - self->dma_handle = 0;
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
99 + ${local.self.k_dma_handle} = 0;
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
100 return err;
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
101 }
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
102 return 0;
115
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
103 @@ -89,7 +84,7 @@
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
104
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
105 static void rtx_socket_skbuff_unmap_and_free(${Socket::SKBuff.ref} self,
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
106 struct device *dev,
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
107 - enum dma_data_direction direction)
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
108 + ${DMA::DMADirection} direction)
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
109 {
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
110 ${Socket::AbstractSKBuff.ref} skb = self->skbuff;
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
111
115
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
112 @@ -100,7 +95,7 @@
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
113 dma_unmap_single(dev,
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
114 self->dma_handle,
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
115 skb_headlen(${local.skb.k_sk_buff}),
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
116 - direction);
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
117 + ${local.direction.dma_direction});
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
118 self->dma_handle = 0;
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
119 }
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
120 dev_kfree_skb_any(${local.skb.k_sk_buff});
115
5a663f8f0e54 WIP, fix another small bug in rathaxes sequence calls
Louis Opter <louis@lse.epita.fr>
parents: 114
diff changeset
121 @@ -126,30 +121,32 @@
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
122
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
123 method map_to(Device::AbstractDevice dev)
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
124 {
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
125 - rtx_socket_skbuff_map(${self}, ${dev.k_device}, DMA_TO_DEVICE);
113
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
126 + rtx_socket_skbuff_map(${self}, ${dev}, RTX_DMA_TO_DEVICE);
112
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
127 }
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
128
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
129 method map_from(Device::AbstractDevice dev)
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
130 {
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
131 - rtx_socket_skbuff_map(${self}, ${dev.k_device}, DMA_FROM_DEVICE);
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
132 + rtx_socket_skbuff_map(${self}, ${dev.k_device}, RTX_DMA_FROM_DEVICE);
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
133 }
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
134
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
135 method unmap_to_and_free(Device::AbstractDevice dev)
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
136 {
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
137 - rtx_socket_skbuff_unmap_and_free(${self}, ${dev.k_device}, DMA_TO_DEVICE);
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
138 + rtx_socket_skbuff_unmap_and_free(${self}, ${dev.k_device}, RTX_DMA_TO_DEVICE);
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
139 }
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
140
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
141 method unmap_from_and_free(Device::AbstractDevice dev)
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
142 {
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
143 - rtx_socket_skbuff_unmap_and_free(${self}, ${dev.k_device}, DMA_FROM_DEVICE);
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
144 + rtx_socket_skbuff_unmap_and_free(${self}, ${dev.k_device}, RTX_DMA_FROM_DEVICE);
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
145 }
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
146
Louis Opter <louis@lse.epita.fr>
parents: 111
diff changeset
147 map
113
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
148 {
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
149 - // some work may have to be done here in order
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
150 - // to access to some field of the sk_buff.
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
151 - // We should determine if all the sk_buff management
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
152 - // can be abstracted from the user.
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
153 + // Some work may have to be done here in order to access to some
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
154 + // field of the sk_buff. We should determine if all the sk_buff
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
155 + // management can be abstracted from the user. But this is at least
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
156 + // useful for internal use:
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
157 + k_sk_buff: ((struct skbuff *)(${self}->skbuff));
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
158 + k_dma_handle: ((dma_addr_t)(${self}->dma_handle));
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
159 }
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
160 }
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
161 }
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
162 diff --git a/rathaxes/samples/e1000/socket.rti b/rathaxes/samples/e1000/socket.rti
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
163 --- a/rathaxes/samples/e1000/socket.rti
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
164 +++ b/rathaxes/samples/e1000/socket.rti
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
165 @@ -1,4 +1,4 @@
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
166 -interface Socket : LKM, Device
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
167 +interface Socket : LKM, Device, DMA
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
168 {
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
169 /* The SKBuff type from the kernel */
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
170 provided type AbstractSKBuff
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
171 @@ -19,5 +19,8 @@
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
172 method map_from(Device::AbstractDevice);
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
173 method unmap_to_and_free(Device::AbstractDevice);
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
174 method unmap_from_and_free(Device::AbstractDevice);
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
175 +
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
176 + attribute Socket::AbstractSKBuff.ref k_sk_buff;
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
177 + attribute DMA::AbstractDMAHandle.scalar k_dma_handle;
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
178 }
b22983cb9e3a WIP, thanks joa for some fixes on the compiler
Louis Opter <louis@lse.epita.fr>
parents: 112
diff changeset
179 }