# HG changeset patch
# User Louis Opter <louis@lse.epita.fr>
# Date 1329649734 -3600
# Node ID c189b4b4406093c9ab61de529e76ef4515d1bd11
# Parent  3d37fa01b19c9e0536fbcd7b26f4e491332d51d5# Parent  6e9dcbd120c593259e0e56e44fa46c6874b91d18
Automated merge with https://www.kalessin.fr/projs/hg/epitech/mq/rathaxes/

diff -r 3d37fa01b19c -r c189b4b44060 rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch
--- a/rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch	Sat Feb 18 20:20:37 2012 +0100
+++ b/rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch	Sun Feb 19 12:08:54 2012 +0100
@@ -176,9 +176,12 @@
          }
      }
  
-@@ -275,7 +293,7 @@
+@@ -273,9 +291,9 @@
+             }
+         }
  
-         chunk   ::CALL()
+-        chunk   ::CALL()
++        chunk   ::CALL
          {
 -            rtx_e1000_register_read32(&${ctx}, ${reg_offset});
 +            rtx_e1000_register_read32(${ctx}, ${reg_offset});
@@ -193,17 +196,18 @@
 +        chunk   ::CALL
          {
 -            rtx_e1000_register_write32(&${ctx}, ${reg_offset});
-+            rtx_e1000_register_write32(${ctx}, ${reg_offset});
++            rtx_e1000_register_write32(${ctx}, ${reg_offset}, ${value});
          }
      }
  
-@@ -315,17 +333,18 @@
+@@ -315,17 +333,19 @@
              }
          }
  
 -        chunk   ::CALL()
 +        chunk   ::CALL
          {
++            rtx_e1000_register_set32(${ctx}, ${reg_offset}, ${value});
          }
      }
  
@@ -218,7 +222,7 @@
          chunk   LKM::prototypes()
          {
              static int e1000_setup_interrupt_handler(struct rtx_ethernet_dev *);
-@@ -345,20 +364,20 @@
+@@ -345,20 +365,20 @@
  
                  if (error)
                  {
@@ -242,7 +246,7 @@
                  if (error)
                  {
                      return error;
-@@ -367,7 +386,7 @@
+@@ -367,7 +387,7 @@
          }
      }
  
@@ -251,7 +255,7 @@
      {
          chunk   LKM::prototypes()
          {
-@@ -378,22 +397,21 @@
+@@ -378,22 +398,21 @@
          {
              static void e1000_free_interrupt_handler(struct rtx_ethernet_dev *ethernet_ctx)
              {
@@ -279,7 +283,7 @@
                                         E1000_INTR_TXDW |
                                         E1000_INTR_TXQE |
                                         E1000_INTR_LSC  |
-@@ -402,11 +420,11 @@
+@@ -402,11 +421,11 @@
          }
      }
  
@@ -294,7 +298,7 @@
                                       E1000_CMD_ASDE |
                                       E1000_CMD_SLU  |
                                       E1000_CMD_LRST |
-@@ -414,20 +432,20 @@
+@@ -414,20 +433,20 @@
          }
      }
  
@@ -725,7 +729,7 @@
  
      PCI::vendor_id = 0x8086;
 -    PCI::product_id = 0x100f;
-+    PCI::product_id = 0x100e;
++    PCI::product_id = 0x100e; /* e100f on vmware by default it seems */
      PCI::set_master = true;
  
      Ethernet::ifname = "rtx%d";