Mercurial > archived > louis > epitech > mq > rathaxes

annotate rathaxes_rename_pci_device_to_pci_abstractdevice.patch @ 99:e2c237d6c37b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update patches against David's new decl system
author Louis Opter <louis@lse.epita.fr>
date Thu, 22 Nov 2012 22:47:25 -0800
parents 3e715b3e0ecd
children
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
99
e2c237d6c37b Update patches against David's new decl system
Louis Opter <louis@lse.epita.fr>
parents: 96
diff changeset
2 # Parent 4fad2a334860f1c79c7f735c48cd70f6bcadbcad
96
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
3 rathaxes: rename PCI::Device to PCI::AbstractDevice 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 To respect my "new" convention of prefixing Rathaxes types that just map
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
6 types from the kernel with "Abstract".
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
7
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
8 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
9 --- 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
10 +++ b/rathaxes/samples/e1000/e1000.blt
99
e2c237d6c37b Update patches against David's new decl system
Louis Opter <louis@lse.epita.fr>
parents: 96
diff changeset
11 @@ -447,7 +447,7 @@
96
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
12
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
13 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
14 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
15 - chunk Ethernet::create_device(PCI::Device 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
16 + 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
17 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
18 /*
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
19 * PCI init stuff:
99
e2c237d6c37b Update patches against David's new decl system
Louis Opter <louis@lse.epita.fr>
parents: 96
diff changeset
20 @@ -515,7 +515,7 @@
96
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
21
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
22 template sequence e1000::destroy_device()
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
23 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
24 - chunk Ethernet::destroy_device(PCI::Device 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
25 + chunk Ethernet::destroy_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
26 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
27 /*
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
28 * Here, we should have some checks to avoid to free resources that
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
29 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
30 --- 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
31 +++ b/rathaxes/samples/e1000/e1000.rti
99
e2c237d6c37b Update patches against David's new decl system
Louis Opter <louis@lse.epita.fr>
parents: 96
diff changeset
32 @@ -72,13 +72,13 @@
96
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 provided sequence create_device()
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
35 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
36 - provided chunk Ethernet::create_device(PCI::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
37 + provided chunk 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
38 provided chunk ::CALL();
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
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
41 provided sequence destroy_device()
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
42 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
43 - provided chunk Ethernet::destroy_device(PCI::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
44 + provided chunk Ethernet::destroy_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
45 provided chunk ::CALL();
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
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
48 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
49 --- 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
50 +++ 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
51 @@ -86,7 +86,7 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
52 typedef struct rtx_ethernet_dev
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
53 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
54 /*
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
55 - * I think it's useless to use the ${PCI::Device} "abstraction"
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
56 + * I think it's useless to use the ${PCI::AbstractDevice} "abstraction"
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
57 * here, since we already are in a Linux specific context.
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
58 */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
59 struct pci_dev *pci_dev;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
60 @@ -100,7 +100,7 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
61 } *rtx_ethernet_dev_p;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
62 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
63
99
e2c237d6c37b Update patches against David's new decl system
Louis Opter <louis@lse.epita.fr>
parents: 96
diff changeset
64 - method init(Ethernet::AbstractDevice net_dev, PCI::Device pci_dev)
e2c237d6c37b Update patches against David's new decl system
Louis Opter <louis@lse.epita.fr>
parents: 96
diff changeset
65 + method init(Ethernet::AbstractDevice net_dev, PCI::AbstractDevice pci_dev)
96
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
66 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
67 ${self} = netdev_priv(${net_dev});
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
68 /*
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
69 @@ -211,7 +211,7 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
70 }
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 /* For now the type is not handled, so we just omit it (see #17) */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
73 - chunk PCI::pci_probe_hook(PCI::Device pdev)
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
74 + chunk PCI::pci_probe_hook(PCI::AbstractDevice pdev)
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
75 {
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 * This typedef is needed to workaround a bug in CNorm __std__
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
78 @@ -262,7 +262,7 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
79
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
80 template sequence Ethernet::exit()
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
81 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
82 - chunk PCI::pci_remove_hook(PCI::Device pdev)
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
83 + chunk PCI::pci_remove_hook(PCI::AbstractDevice pdev)
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
84 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
85 /* workaround for cnorm unstrict */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
86 struct net_device *net_dev = pci_get_drvdata(${pdev});
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
87 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
88 --- 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
89 +++ 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
90 @@ -17,16 +17,11 @@
99
e2c237d6c37b Update patches against David's new decl system
Louis Opter <louis@lse.epita.fr>
parents: 96
diff changeset
91 decl data_types();
96
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
92 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
93
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
94 - /*
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
95 - * Unlike PCI::Device, Ethernet::Device doesn't match the struct net_device
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
96 - * from Linux. Ethernet::Device is the type that we use in the private
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
97 - * field of the struct net_device.
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 provided type Device
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
100 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
101 chunk LKM::includes();
99
e2c237d6c37b Update patches against David's new decl system
Louis Opter <louis@lse.epita.fr>
parents: 96
diff changeset
102 decl data_types();
96
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
103 - method init(Ethernet::AbstractDevice, PCI::Device);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
104 + 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
105 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
106 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
107
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
108 @@ -57,15 +52,15 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
109 provided sequence init()
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
110 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
111 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
112 - provided chunk PCI::pci_probe_hook(PCI::Device);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
113 + 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
114
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
115 - provided pointcut Ethernet::create_device(PCI::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
116 + 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
117 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
118
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
119 provided sequence exit()
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 - provided chunk PCI::pci_remove_hook(PCI::Device);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
122 + provided chunk PCI::pci_remove_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
123
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
124 - provided pointcut Ethernet::destroy_device(PCI::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
125 + provided pointcut Ethernet::destroy_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
126 }
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 diff --git a/rathaxes/samples/e1000/pci.blt b/rathaxes/samples/e1000/pci.blt
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
129 --- a/rathaxes/samples/e1000/pci.blt
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
130 +++ b/rathaxes/samples/e1000/pci.blt
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
131 @@ -1,6 +1,6 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
132 with 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
133 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
134 - template type PCI::Device()
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
135 + template type PCI::AbstractDevice()
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
136 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
137 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
138 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
139 @@ -12,7 +12,7 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
140 struct pci_dev;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
141 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
142
99
e2c237d6c37b Update patches against David's new decl system
Louis Opter <louis@lse.epita.fr>
parents: 96
diff changeset
143 - method init(PCI::Device)
e2c237d6c37b Update patches against David's new decl system
Louis Opter <louis@lse.epita.fr>
parents: 96
diff changeset
144 + method init(PCI::AbstractDevice)
96
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
145 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
146 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
147
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
148 @@ -41,7 +41,7 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
149 goto fail;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
150
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
151 /* Use local. to reference a local C variable: */
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
152 - ${cast local.pdev as PCI::Device};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
153 + ${cast local.pdev as PCI::AbstractDevice};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
154 ${pointcut PCI::pci_probe_hook(local.pdev)};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
155
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
156 return 0;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
157 @@ -68,7 +68,7 @@
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 static void rtx_pci_remove(struct pci_dev *pdev)
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
160 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
161 - ${cast local.pdev as PCI::Device};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
162 + ${cast local.pdev as PCI::AbstractDevice};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
163 ${pointcut PCI::pci_remove_hook(local.pdev)};
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
164
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
165 pci_disable_device(pdev);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
166 diff --git a/rathaxes/samples/e1000/pci.rti b/rathaxes/samples/e1000/pci.rti
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
167 --- a/rathaxes/samples/e1000/pci.rti
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
168 +++ b/rathaxes/samples/e1000/pci.rti
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
169 @@ -1,10 +1,10 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
170 interface PCI : LKM
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 PCI::Device
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
173 + provided type PCI::AbstractDevice
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
174 {
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
175 chunk LKM::includes();
99
e2c237d6c37b Update patches against David's new decl system
Louis Opter <louis@lse.epita.fr>
parents: 96
diff changeset
176 decl data_types();
96
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
177 - method init(PCI::Device);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
178 + method init(PCI::AbstractDevice);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
179 }
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 required variable Builtin::number PCI::vendor_id;
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
182 @@ -28,7 +28,7 @@
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::prototypes();
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 LKM::code();
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 PCI::pci_probe_hook(PCI::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 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
188 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
189
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
190 provided sequence remove()
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
191 @@ -36,6 +36,6 @@
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
192 provided chunk LKM::prototypes();
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
193 provided chunk LKM::code();
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
194
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
195 - provided pointcut PCI::pci_remove_hook(PCI::Device);
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
196 + provided pointcut PCI::pci_remove_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
197 }
3e715b3e0ecd Start a series to cleanup/refactor the e1000 sample a little bit
Louis Opter <louis@lse.epita.fr>
parents:
diff changeset
198 }