--- upstream/dynamips-0.2.6-RC4/dev_c7200_serial.c	2007/10/06 16:08:03	5
+++ upstream/dynamips-0.2.7-RC3/dev_c7200_serial.c	2007/10/06 16:26:06	9
@@ -1,5 +1,5 @@
 /*  
- * Cisco C7200 (Predator) Simulation Platform.
+ * Cisco router simulation platform.
  * Copyright (C) 2005,2006 Christophe Fillot.  All rights reserved.
  *
  * Serial Interfaces (Mueslix).
@@ -24,7 +24,8 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "mips64.h"
+#include "cpu.h"
+#include "vm.h"
 #include "dynamips.h"
 #include "memory.h"
 #include "device.h"
@@ -53,7 +54,7 @@
    /* Create the Mueslix chip */
    data = dev_mueslix_init(router->vm,name,1,
                            router->pa_bay[pa_bay].pci_map,0,
-                           C7200_NETIO_IRQ);
+                           c7200_net_irq_for_slot_port(pa_bay,0));
    if (!data) return(-1);
 
    /* Store device info into the router structure */
@@ -137,13 +138,13 @@
    /* Create the 1st Mueslix chip */
    data->mueslix[0] = dev_mueslix_init(router->vm,name,1,
                                        router->pa_bay[pa_bay].pci_map,0,
-                                       C7200_NETIO_IRQ);
+                                       c7200_net_irq_for_slot_port(pa_bay,0));
    if (!data->mueslix[0]) return(-1);
 
    /* Create the 2nd Mueslix chip */
    data->mueslix[1] = dev_mueslix_init(router->vm,name,1,
                                        router->pa_bay[pa_bay].pci_map,1,
-                                       C7200_NETIO_IRQ);
+                                       c7200_net_irq_for_slot_port(pa_bay,1));
    if (!data->mueslix[1]) return(-1);
 
    /* Store device info into the router structure */