--- upstream/dynamips-0.2.5/dev_c3600_serial.c	2007/10/06 16:01:44	1
+++ upstream/dynamips-0.2.7-RC1/dev_c3600_serial.c	2007/10/06 16:23:47	7
@@ -1,5 +1,5 @@
 /*  
- * Cisco C3600 (Predator) simulation platform.
+ * Cisco router simulation platform.
  * Copyright (c) 2006 Christophe Fillot (cf@utc.fr)
  *
  * Serial Network Modules.
@@ -26,20 +26,10 @@
 /* NM-4T                                                                  */
 /* ====================================================================== */
 
-/* NM-4T: 4 Serial Network Module EEPROM */
-static m_uint16_t eeprom_c3600_nm_4t_data[64] = {
-   0x0154, 0x0101, 0x009D, 0x2D64, 0x5009, 0x0A02, 0x0000, 0x0000,
-   0x5800, 0x0000, 0x9811, 0x0300, 0x0005, 0xFFFF, 0xFFFF, 0xFFFF,
-};
-
-static const struct c3600_eeprom eeprom_c3600_nm_4t = {
-   "NM-4T", eeprom_c3600_nm_4t_data, sizeof(eeprom_c3600_nm_4t_data)/2,
-};
-
 /*
  * dev_c3600_nm_4t_init()
  *
- * Add a PA-4T network module into specified slot.
+ * Add a NM-4T network module into specified slot.
  */
 int dev_c3600_nm_4t_init(c3600_t *router,char *name,u_int nm_bay)
 {
@@ -47,13 +37,13 @@
    struct mueslix_data *data;
 
    /* Set the EEPROM */
-   c3600_nm_set_eeprom(router,nm_bay,&eeprom_c3600_nm_4t);
+   c3600_nm_set_eeprom(router,nm_bay,cisco_eeprom_find_nm("NM-4T"));
 
    /* Get PCI bus info about this bay */
    bay_info = c3600_nm_get_bay_info(c3600_chassis_get_id(router),nm_bay);
 
    if (!bay_info) {
-      fprintf(stderr,"%s: unable to get info for PA bay %u\n",name,nm_bay);
+      fprintf(stderr,"%s: unable to get info for NM bay %u\n",name,nm_bay);
       return(-1);
    }
 
@@ -68,7 +58,7 @@
    return(c3600_nm_set_drvinfo(router,nm_bay,data));
 }
 
-/* Remove a PA-4T+ from the specified slot */
+/* Remove a NM-4T from the specified slot */
 int dev_c3600_nm_4t_shutdown(c3600_t *router,u_int nm_bay) 
 {
    struct c3600_nm_bay *bay;
@@ -113,4 +103,5 @@
    dev_c3600_nm_4t_shutdown,
    dev_c3600_nm_4t_set_nio,
    dev_c3600_nm_4t_unset_nio,
+   NULL,
 };