--- a/rathaxes_change_the_abstract_type_notation_in_the_e1000_sample.patch	Fri Mar 22 00:25:52 2013 -0700
+++ b/rathaxes_change_the_abstract_type_notation_in_the_e1000_sample.patch	Mon Mar 25 01:17:56 2013 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 1fa9b24e6012b2d53f1a84d4606cf3b6b9685fef
+# Parent f046837f963dcba715cebe8b6dc40e7bbe2ce598
 rathaxes: change the abstract type notation in the e1000 sample
 
 Starting with ra24db32bf134 Rathaxes types are generated differently: you
@@ -56,8 +56,8 @@
          decl        data_types();
          chunk       LKM::includes();
          method      init();
--        attribute   Builtin::symbol data;
-+        attribute   Builtin::symbol k_device;
+-        attribute   Builtin::symbol.scalar data;
++        attribute   Builtin::symbol.scalar k_device;
      }
  }
 diff --git a/rathaxes/samples/e1000/e1000.blt b/rathaxes/samples/e1000/e1000.blt
@@ -472,30 +472,17 @@
          chunk       LKM::includes();
 +        method      init(Builtin::symbol);
          decl        data_types();
--        attribute   Builtin::symbol netdev;
+-        attribute   Builtin::symbol.scalar netdev;
 +
-+        attribute   Builtin::symbol k_net_dev;
++        attribute   Builtin::symbol.scalar k_net_dev;
 +        /*
 +         * XXX: should be a Ethernet::Device, but that causes a circular
 +         * dependency.
 +         */
-+        attribute   Builtin::symbol rtx_ether_ctx;
++        attribute   Builtin::symbol.scalar rtx_ether_ctx;
      }
  
      provided type   Device
-@@ -34,9 +41,9 @@
-          * I'd like to use better names here, but I'd like to understand the
-          * difference between the two first:
-          */
--        attribute   Builtin::symbol             perm_addr;
--        attribute   Builtin::symbol             dev_addr;
--        attribute   Builtin::symbol             irq;
-+        attribute   Builtin::symbol perm_addr;
-+        attribute   Builtin::symbol dev_addr;
-+        attribute   Builtin::symbol irq;
-     }
- 
-     required sequence   open(Ethernet::Device)
 diff --git a/rathaxes/samples/e1000/pci.blt b/rathaxes/samples/e1000/pci.blt
 --- a/rathaxes/samples/e1000/pci.blt
 +++ b/rathaxes/samples/e1000/pci.blt
@@ -617,32 +604,34 @@
          chunk       LKM::includes();
          method      init(PCI::AbstractDevice);
 -        method      set_context(Builtin::symbol);
+-
+-        attribute   Builtin::symbol.scalar data;
+-        attribute   Builtin::symbol.scalar drv_data;
 +        /*
 +         * XXX: the argument should be a PCI::Device but that causes a circular
 +         * dependency:
 +         */
 +        method      set_rtx_context(Builtin::symbol);
- 
--        attribute   Builtin::symbol data;
--        attribute   Builtin::symbol drv_data;
-+        attribute   Builtin::symbol k_pci_dev;
++ 
++        attribute   Builtin::symbol.scalar k_pci_dev;
 +        /* XXX: should be PCI::Device (see above point) */
-+        attribute   Builtin::symbol rtx_pci_ctx;
++        attribute   Builtin::symbol.scalar rtx_pci_ctx;
      }
  
      provided type   PCI::Device
-@@ -27,9 +32,9 @@
+@@ -27,9 +32,10 @@
          method      enable();
          method      disable();
          method      select_ioaddr(Builtin::number);
 -        method      set_context(Builtin::symbol);
+ 
+-        attribute   Builtin::symbol.scalar      context;
 +        method      set_rtx_drv_context(Builtin::symbol);
- 
--        attribute   Builtin::symbol         context;
-+        attribute   Builtin::symbol         rtx_drv_context;
-         attribute   Device::AbstractDevice  device;
-         attribute   PCI::AbstractDevice     pci_device;
-         attribute   Builtin::symbol         ioaddr;
++ 
++        attribute   Builtin::symbol.scalar      rtx_drv_context;
+         attribute   Device::AbstractDevice.ref  device;
+         attribute   PCI::AbstractDevice.ref     pci_device;
+         attribute   Builtin::symbol.ref         ioaddr;
 diff --git a/rathaxes/samples/e1000/socket.blt b/rathaxes/samples/e1000/socket.blt
 --- a/rathaxes/samples/e1000/socket.blt
 +++ b/rathaxes/samples/e1000/socket.blt
@@ -751,13 +740,12 @@
 diff --git a/rathaxes/samples/e1000/socket.rti b/rathaxes/samples/e1000/socket.rti
 --- a/rathaxes/samples/e1000/socket.rti
 +++ b/rathaxes/samples/e1000/socket.rti
-@@ -5,7 +5,8 @@
+@@ -5,7 +5,7 @@
      {
          chunk       LKM::includes();
          decl        data_types();
--        attribute   Builtin::symbol data;
-+
-+        attribute   Builtin::symbol k_sk_buff;
+-        attribute   Builtin::symbol.scalar data;
++        attribute   Builtin::symbol.scalar k_sk_buff;
      }
  
      provided type   SKBuff