--- a/rathaxes_rename_pci_device_to_pci_abstractdevice.patch	Thu Nov 22 16:41:18 2012 -0800
+++ b/rathaxes_rename_pci_device_to_pci_abstractdevice.patch	Thu Nov 22 22:47:25 2012 -0800
@@ -1,15 +1,14 @@
 # HG changeset patch
-# Parent 71f853429e57cb8926fb03e2cacf04a45ad4e8dd
+# Parent 4fad2a334860f1c79c7f735c48cd70f6bcadbcad
 rathaxes: rename PCI::Device to PCI::AbstractDevice in the e1000 sample
 
 To respect my "new" convention of prefixing Rathaxes types that just map
 types from the kernel with "Abstract".
 
-
 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
-@@ -479,7 +479,7 @@
+@@ -447,7 +447,7 @@
  
      template sequence   e1000::create_device()
      {
@@ -18,7 +17,7 @@
          {
              /*
               * PCI init stuff:
-@@ -547,7 +547,7 @@
+@@ -515,7 +515,7 @@
  
      template sequence   e1000::destroy_device()
      {
@@ -30,7 +29,7 @@
 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
-@@ -78,13 +78,13 @@
+@@ -72,13 +72,13 @@
  
      provided sequence   create_device()
      {
@@ -62,8 +61,8 @@
              } *rtx_ethernet_dev_p;
          }
  
--        chunk ::init(Ethernet::AbstractDevice net_dev, PCI::Device pci_dev)
-+        chunk ::init(Ethernet::AbstractDevice net_dev, PCI::AbstractDevice pci_dev)
+-        method init(Ethernet::AbstractDevice net_dev, PCI::Device pci_dev)
++        method init(Ethernet::AbstractDevice net_dev, PCI::AbstractDevice pci_dev)
          {
              ${self} = netdev_priv(${net_dev});
              /*
@@ -89,7 +88,7 @@
 --- a/rathaxes/samples/e1000/ethernet.rti
 +++ b/rathaxes/samples/e1000/ethernet.rti
 @@ -17,16 +17,11 @@
-         method      decl();
+         decl        data_types();
      }
  
 -    /*
@@ -100,7 +99,7 @@
      provided type   Device
      {
          chunk       LKM::includes();
-         method      decl();
+         decl        data_types();
 -        method      init(Ethernet::AbstractDevice, PCI::Device);
 +        method      init(Ethernet::AbstractDevice, PCI::AbstractDevice);
          pointcut    Ethernet::SubContext();
@@ -141,8 +140,8 @@
              struct pci_dev;
          }
  
--        chunk ::init(PCI::Device)
-+        chunk ::init(PCI::AbstractDevice)
+-        method init(PCI::Device)
++        method init(PCI::AbstractDevice)
          {
          }
  
@@ -174,7 +173,7 @@
 +    provided type   PCI::AbstractDevice
      {
          chunk       LKM::includes();
-         method      decl();
+         decl        data_types();
 -        method      init(PCI::Device);
 +        method      init(PCI::AbstractDevice);
      }