diff rathaxes_cleanups_in_ethernet_rti_blt.patch @ 99:e2c237d6c37b

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 147519512c3d
children
line wrap: on
line diff
--- a/rathaxes_cleanups_in_ethernet_rti_blt.patch	Thu Nov 22 16:41:18 2012 -0800
+++ b/rathaxes_cleanups_in_ethernet_rti_blt.patch	Thu Nov 22 22:47:25 2012 -0800
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 6cc56c206e65a31121a9e9745003fed8276b0b60
+# Parent 47ae8b89654899f0d6e2c0d656ca52c996d53262
 rathaxes: tidy up ethernet.{rti,blt} in the e1000 sample
 
 - Remove typedefs;
@@ -11,7 +11,7 @@
 diff --git a/rathaxes/samples/e1000/e1000.blt b/rathaxes/samples/e1000/e1000.blt
 --- a/rathaxes/samples/e1000/e1000.blt
 +++ b/rathaxes/samples/e1000/e1000.blt
-@@ -284,7 +284,7 @@
+@@ -267,7 +267,7 @@
              };
          }
  
@@ -23,21 +23,21 @@
 diff --git a/rathaxes/samples/e1000/e1000.rti b/rathaxes/samples/e1000/e1000.rti
 --- a/rathaxes/samples/e1000/e1000.rti
 +++ b/rathaxes/samples/e1000/e1000.rti
-@@ -9,7 +9,7 @@
+@@ -7,7 +7,7 @@
+ 
+     provided type   Context
      {
-         method      decl();
- 
 -        chunk       Ethernet::SubContext();
 +        chunk       Ethernet::HardwareContext();
+         decl        data_types();
+         method      init();
  
-         /* Callbacks/Hooks which should probably be in the front-end: */
-         chunk       Ethernet::adapter_init_context(Ethernet::Device,
 diff --git a/rathaxes/samples/e1000/ethernet.blt b/rathaxes/samples/e1000/ethernet.blt
 --- a/rathaxes/samples/e1000/ethernet.blt
 +++ b/rathaxes/samples/e1000/ethernet.blt
 @@ -59,7 +59,7 @@
  
-         chunk ::decl()
+         decl  data_types()
          {
 -            typedef struct net_device *net_devp;
 +            struct net_device;
@@ -46,7 +46,7 @@
          map
 @@ -76,14 +76,7 @@
  
-         chunk ::decl()
+         decl  data_types()
          {
 -            /*
 -             * So, at first sight, it sucks to typedef it as pointer but (for
@@ -70,7 +70,7 @@
 +            };
          }
  
-         chunk ::init(Ethernet::AbstractDevice net_dev, PCI::AbstractDevice pci_dev)
+         method init(Ethernet::AbstractDevice net_dev, PCI::AbstractDevice pci_dev)
 @@ -105,7 +98,7 @@
              ${self} = netdev_priv(${net_dev});
              /*
@@ -162,7 +162,7 @@
 +++ b/rathaxes/samples/e1000/ethernet.rti
 @@ -22,7 +22,7 @@
          chunk       LKM::includes();
-         method      decl();
+         decl        data_types();
          method      init(Ethernet::AbstractDevice, PCI::AbstractDevice);
 -        pointcut    Ethernet::SubContext();
 +        pointcut    Ethernet::HardwareContext();