changeset 69:8bb53638585b

WIP on the e1000 sample: fix build
author Louis Opter <louis@lse.epitech.net>
date Sat, 18 Feb 2012 18:13:36 +0100
parents ef460b936b5f
children c22a9acf8cd7
files rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch	Sat Feb 18 16:04:02 2012 +0100
+++ b/rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch	Sat Feb 18 18:13:36 2012 +0100
@@ -177,7 +177,7 @@
          }
      }
  
-@@ -320,7 +337,7 @@
+@@ -320,12 +337,13 @@
          }
      }
  
@@ -186,7 +186,13 @@
      {
          chunk   LKM::includes()
          {
-@@ -345,20 +362,20 @@
+             #include <linux/interrupt.h>
+         }
++
+         chunk   LKM::prototypes()
+         {
+             static int e1000_setup_interrupt_handler(struct rtx_ethernet_dev *);
+@@ -345,20 +363,20 @@
  
                  if (error)
                  {
@@ -210,7 +216,7 @@
                  if (error)
                  {
                      return error;
-@@ -423,7 +440,7 @@
+@@ -423,7 +441,7 @@
              intr = rtx_e1000_register_read32(ctx, E1000_ICR);
              if (intr & E1000_INTR_LSC)
              {
@@ -326,7 +332,7 @@
                  struct rtx_e1000_ctx* ctx = &rtx_ether_dev->hw_ctx;
  
 -                ${pointcut ::IMPLEMENTATION};
-+                ${pointcut ::IMPLEMENTATION(local.rtx_ethernet_dev)};
++                ${pointcut ::IMPLEMENTATION(local.rtx_ether_dev)};
  
                  return 0;
              }