[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[tyndur-devel] [PATCH 5/5] rtl8139: tyndur-spezifische Sachen



! rtl8139: tyndur-spezifisches in #ifdef
* rtl8139: Unbenoetigtes #include <string.h> entfernt

Signed-off-by: Kevin Wolf <kevin@xxxxxxxxxx>
---
 src/modules/cdi/rtl8139/main.c    |    8 +++++++-
 src/modules/cdi/rtl8139/rtl8139.c |    1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/modules/cdi/rtl8139/main.c b/src/modules/cdi/rtl8139/main.c
index 8e340c8..4411a1f 100644
--- a/src/modules/cdi/rtl8139/main.c
+++ b/src/modules/cdi/rtl8139/main.c
@@ -44,8 +44,10 @@ static struct {
 
 static const char* driver_name = "rtl8139";
 
-// FIXME: LOST-spezifisch
+#ifdef TYNDUR
+// FIXME: tyndur-spezifisch
 uint32_t string_to_ip(char* ip);
+#endif
 
 static void process_parameter(struct module_options* options, char* param);
 static int rtl8139_driver_init(int argc, char* argv[]);
@@ -113,7 +115,9 @@ static int rtl8139_driver_init(int argc, char* argv[])
 
             device->phys = phys_device;
             device->pci = dev;
+#ifdef TYNDUR
             device->net.ip = options.ip;
+#endif
             cdi_list_push(driver.net.drv.devices, device);
         } else {
             cdi_pci_device_destroy(dev);
@@ -128,6 +132,7 @@ static int rtl8139_driver_init(int argc, char* argv[])
 
 static void process_parameter(struct module_options* options, char* param)
 {
+#ifdef TYNDUR
     printf("rtl8139-Parameter: %s\n", param);
 
     if (strncmp(param, "ip=", 3) == 0) {
@@ -137,6 +142,7 @@ static void process_parameter(struct module_options* options, char* param)
     } else {
         printf("Unbekannter Parameter %s\n", param);
     }
+#endif
 }
 
 /**
diff --git a/src/modules/cdi/rtl8139/rtl8139.c b/src/modules/cdi/rtl8139/rtl8139.c
index 7b43154..ab38d93 100644
--- a/src/modules/cdi/rtl8139/rtl8139.c
+++ b/src/modules/cdi/rtl8139/rtl8139.c
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <string.h>
 
 #include "cdi/net.h"
 #include "cdi/pci.h"
-- 
1.6.0.2