Add dummy_connect and dummy_irq

diff --git a/src/core/nic.c b/src/core/nic.c
index 2cda9e8e7f457654361878571639b3e54612ee73..59344f4a069d49dbd0079a7d2a92417a77778b8b 100644 (file)
--- a/src/core/nic.c
+++ b/src/core/nic.c
@@ -257,9 +257,9 @@ static int nic_load_configuration(struct dev *dev __unused)
 #endif
        if (!server_found) {
                printf("No Server found\n");
-               longjmp(restart_etherboot, -1);
+               return 0;
        }
-       return 0;
+       return 1;
 }
 
 
@@ -312,7 +312,7 @@ static int nic_load(struct dev *dev __unused)
                printf("No filename\n");
        }
        interruptible_sleep(2);         /* lay off the server for a while */
-       longjmp(restart_etherboot, -1);
+       return 0;
 }
 
 
@@ -329,12 +329,19 @@ static void nic_disable ( struct dev *dev ) {
        nic->nic_op->disable ( nic );
 }
 
+static void nic_print_info ( struct dev *dev ) {
+       struct nic *nic = &dev->nic;
+
+       printf ( "Found %s NIC (MAC %!)\n", dev->name, nic->node_addr );
+}
+
 /* 
  * Device operations tables
  *
  */
 static struct dev_operations nic_operations = {
        .disable = nic_disable,
+       .print_info = nic_print_info,
        .load_configuration = nic_load_configuration,
        .load = nic_load,
 };
@@ -363,8 +370,13 @@ struct nic * nic_device ( struct dev *dev ) {
 
 
 
+int dummy_connect ( struct nic *nic ) {
+       return 1;
+}
 
-
+int dummy_irq ( struct nic *nic ) {
+       return 1;
+}
 
 /**************************************************************************
 DEFAULT_NETMASK - Return default netmask for IP address

diff --git a/src/include/nic.h b/src/include/nic.h
index 4a53a8d63078d06e8e956ca8737b46c8a5d49024..ae7dd606d9404e53113cefb37017522cb1b874c9 100644 (file)
--- a/src/include/nic.h
+++ b/src/include/nic.h
@@ -44,6 +44,8 @@ struct nic_operations {
  */
 struct dev;
 extern struct nic * nic_device ( struct dev * dev );
+extern int dummy_connect ( struct nic *nic );
+extern int dummy_irq ( struct nic *nic );
 
 /*
  * Functions that implicitly operate on the current boot device