patch-2.4.23 linux-2.4.23/arch/ia64/sn/io/sn2/klconflib.c
Next file: linux-2.4.23/arch/ia64/sn/io/sn2/klgraph.c
Previous file: linux-2.4.23/arch/ia64/sn/io/sn2/ioc4/sio_ioc4.c
Back to the patch index
Back to the overall index
- Lines: 57
- Date:
2003-11-28 10:26:19.000000000 -0800
- Orig file:
linux-2.4.22/arch/ia64/sn/io/sn2/klconflib.c
- Orig date:
2003-08-25 04:44:39.000000000 -0700
diff -urN linux-2.4.22/arch/ia64/sn/io/sn2/klconflib.c linux-2.4.23/arch/ia64/sn/io/sn2/klconflib.c
@@ -39,7 +39,7 @@
static int hasmetarouter;
-char brick_types[MAX_BRICK_TYPES + 1] = "crikxdpn%#=012345";
+char brick_types[MAX_BRICK_TYPES + 1] = "crikxdpn%#=vo2345";
lboard_t *
find_lboard(lboard_t *start, unsigned char brd_type)
@@ -278,6 +278,8 @@
board_name = EDGE_LBL_XBRICK;
else if (brd->brd_type == KLTYPE_PEBRICK)
board_name = EDGE_LBL_PEBRICK;
+ else if (brd->brd_type == KLTYPE_OPUSBRICK)
+ board_name = EDGE_LBL_OPUSBRICK;
else if (brd->brd_type == KLTYPE_CGBRICK)
board_name = EDGE_LBL_CGBRICK;
else
@@ -293,23 +295,6 @@
sprintf(path, EDGE_LBL_MODULE "/%s/" EDGE_LBL_SLAB "/%d/%s", buffer, geo_slab(brd->brd_geoid), board_name);
}
-/*
- * Get the module number for a NASID.
- */
-moduleid_t
-get_module_id(nasid_t nasid)
-{
- lboard_t *brd;
-
- brd = find_lboard((lboard_t *)KL_CONFIG_INFO(nasid), KLTYPE_SNIA);
-
- if (!brd)
- return INVALID_MODULE;
- else
- return geo_module(brd->brd_geoid);
-}
-
-
#define MHZ 1000000
@@ -419,7 +404,13 @@
strcpy(serial_number,"");
switch(KLCLASS(board->brd_type)) {
case KLCLASS_CPU: { /* Node board */
- klhub_t *hub;
+ klhub_t *hub;
+
+ if (board->brd_type == KLTYPE_TIO) {
+ printk("*****board_serial_number_get: Need to support TIO.*****\n");
+ strcpy(serial_number,"");
+ return(0);
+ }
/* Get the hub component information */
hub = (klhub_t *)find_first_component(board,
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)