git://git.onelab.eu / linux-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git] / drivers / isdn / capi / capiutil.c
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index c26dec6..e7cf6bc 100644 (file)
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -335,85 +335,54 @@ static _cdef cdef[] =
 
 static unsigned char *cpars[] =
 {
-    /*00 */ 0,
-    /*01 ALERT_REQ */ (unsigned char *) "\x03\x04\x0c\x27\x2f\x1c\x01\x01",
-    /*02 CONNECT_REQ */ (unsigned char *) "\x03\x14\x0e\x10\x0f\x11\x0d\x06\x08\x0a\x05\x07\x09\x01\x0b\x28\x22\x04\x0c\x27\x2f\x1c\x01\x01",
-    /*03 */ 0,
-    /*04 DISCONNECT_REQ */ (unsigned char *) "\x03\x04\x0c\x27\x2f\x1c\x01\x01",
-    /*05 LISTEN_REQ */ (unsigned char *) "\x03\x25\x12\x13\x10\x11\x01",
-    /*06 */ 0,
-    /*07 */ 0,
-    /*08 INFO_REQ */ (unsigned char *) "\x03\x0e\x04\x0c\x27\x2f\x1c\x01\x01",
-    /*09 FACILITY_REQ */ (unsigned char *) "\x03\x1f\x1e\x01",
-    /*0a SELECT_B_PROTOCOL_REQ */ (unsigned char *) "\x03\x0d\x06\x08\x0a\x05\x07\x09\x01\x01",
-    /*0b CONNECT_B3_REQ */ (unsigned char *) "\x03\x2b\x01",
-    /*0c */ 0,
-    /*0d DISCONNECT_B3_REQ */ (unsigned char *) "\x03\x2b\x01",
-    /*0e */ 0,
-    /*0f DATA_B3_REQ */ (unsigned char *) "\x03\x18\x1a\x19\x20\x01",
-    /*10 RESET_B3_REQ */ (unsigned char *) "\x03\x2b\x01",
-    /*11 */ 0,
-    /*12 */ 0,
-    /*13 ALERT_CONF */ (unsigned char *) "\x03\x23\x01",
-    /*14 CONNECT_CONF */ (unsigned char *) "\x03\x23\x01",
-    /*15 */ 0,
-    /*16 DISCONNECT_CONF */ (unsigned char *) "\x03\x23\x01",
-    /*17 LISTEN_CONF */ (unsigned char *) "\x03\x23\x01",
-    /*18 MANUFACTURER_REQ */ (unsigned char *) "\x03\x2a\x15\x21\x29\x01",
-    /*19 */ 0,
-    /*1a INFO_CONF */ (unsigned char *) "\x03\x23\x01",
-    /*1b FACILITY_CONF */ (unsigned char *) "\x03\x23\x1f\x1b\x01",
-    /*1c SELECT_B_PROTOCOL_CONF */ (unsigned char *) "\x03\x23\x01",
-    /*1d CONNECT_B3_CONF */ (unsigned char *) "\x03\x23\x01",
-    /*1e */ 0,
-    /*1f DISCONNECT_B3_CONF */ (unsigned char *) "\x03\x23\x01",
-    /*20 */ 0,
-    /*21 DATA_B3_CONF */ (unsigned char *) "\x03\x19\x23\x01",
-    /*22 RESET_B3_CONF */ (unsigned char *) "\x03\x23\x01",
-    /*23 */ 0,
-    /*24 */ 0,
-    /*25 */ 0,
-    /*26 CONNECT_IND */ (unsigned char *) "\x03\x14\x0e\x10\x0f\x11\x0b\x28\x22\x04\x0c\x27\x2f\x1c\x01\x01",
-    /*27 CONNECT_ACTIVE_IND */ (unsigned char *) "\x03\x16\x17\x28\x01",
-    /*28 DISCONNECT_IND */ (unsigned char *) "\x03\x2c\x01",
-    /*29 */ 0,
-    /*2a MANUFACTURER_CONF */ (unsigned char *) "\x03\x2a\x15\x21\x29\x01",
-    /*2b */ 0,
-    /*2c INFO_IND */ (unsigned char *) "\x03\x26\x24\x01",
-    /*2d FACILITY_IND */ (unsigned char *) "\x03\x1f\x1d\x01",
-    /*2e */ 0,
-    /*2f CONNECT_B3_IND */ (unsigned char *) "\x03\x2b\x01",
-    /*30 CONNECT_B3_ACTIVE_IND */ (unsigned char *) "\x03\x2b\x01",
-    /*31 DISCONNECT_B3_IND */ (unsigned char *) "\x03\x2d\x2b\x01",
-    /*32 */ 0,
-    /*33 DATA_B3_IND */ (unsigned char *) "\x03\x18\x1a\x19\x20\x01",
-    /*34 RESET_B3_IND */ (unsigned char *) "\x03\x2b\x01",
-    /*35 CONNECT_B3_T90_ACTIVE_IND */ (unsigned char *) "\x03\x2b\x01",
-    /*36 */ 0,
-    /*37 */ 0,
-    /*38 CONNECT_RESP */ (unsigned char *) "\x03\x2e\x0d\x06\x08\x0a\x05\x07\x09\x01\x16\x17\x28\x04\x0c\x27\x2f\x1c\x01\x01",
-    /*39 CONNECT_ACTIVE_RESP */ (unsigned char *) "\x03\x01",
-    /*3a DISCONNECT_RESP */ (unsigned char *) "\x03\x01",
-    /*3b */ 0,
-    /*3c MANUFACTURER_IND */ (unsigned char *) "\x03\x2a\x15\x21\x29\x01",
-    /*3d */ 0,
-    /*3e INFO_RESP */ (unsigned char *) "\x03\x01",
-    /*3f FACILITY_RESP */ (unsigned char *) "\x03\x1f\x01",
-    /*40 */ 0,
-    /*41 CONNECT_B3_RESP */ (unsigned char *) "\x03\x2e\x2b\x01",
-    /*42 CONNECT_B3_ACTIVE_RESP */ (unsigned char *) "\x03\x01",
-    /*43 DISCONNECT_B3_RESP */ (unsigned char *) "\x03\x01",
-    /*44 */ 0,
-    /*45 DATA_B3_RESP */ (unsigned char *) "\x03\x19\x01",
-    /*46 RESET_B3_RESP */ (unsigned char *) "\x03\x01",
-    /*47 CONNECT_B3_T90_ACTIVE_RESP */ (unsigned char *) "\x03\x01",
-    /*48 */ 0,
-    /*49 */ 0,
-    /*4a */ 0,
-    /*4b */ 0,
-    /*4c */ 0,
-    /*4d */ 0,
-    /*4e MANUFACTURER_RESP */ (unsigned char *) "\x03\x2a\x15\x21\x29\x01",
+    /* ALERT_REQ */ [0x01] = "\x03\x04\x0c\x27\x2f\x1c\x01\x01",
+    /* CONNECT_REQ */ [0x02] = "\x03\x14\x0e\x10\x0f\x11\x0d\x06\x08\x0a\x05\x07\x09\x01\x0b\x28\x22\x04\x0c\x27\x2f\x1c\x01\x01",
+    /* DISCONNECT_REQ */ [0x04] = "\x03\x04\x0c\x27\x2f\x1c\x01\x01",
+    /* LISTEN_REQ */ [0x05] = "\x03\x25\x12\x13\x10\x11\x01",
+    /* INFO_REQ */ [0x08] = "\x03\x0e\x04\x0c\x27\x2f\x1c\x01\x01",
+    /* FACILITY_REQ */ [0x09] = "\x03\x1f\x1e\x01",
+    /* SELECT_B_PROTOCOL_REQ */ [0x0a] = "\x03\x0d\x06\x08\x0a\x05\x07\x09\x01\x01",
+    /* CONNECT_B3_REQ */ [0x0b] = "\x03\x2b\x01",
+    /* DISCONNECT_B3_REQ */ [0x0d] = "\x03\x2b\x01",
+    /* DATA_B3_REQ */ [0x0f] = "\x03\x18\x1a\x19\x20\x01",
+    /* RESET_B3_REQ */ [0x10] = "\x03\x2b\x01",
+    /* ALERT_CONF */ [0x13] = "\x03\x23\x01",
+    /* CONNECT_CONF */ [0x14] = "\x03\x23\x01",
+    /* DISCONNECT_CONF */ [0x16] = "\x03\x23\x01",
+    /* LISTEN_CONF */ [0x17] = "\x03\x23\x01",
+    /* MANUFACTURER_REQ */ [0x18] = "\x03\x2a\x15\x21\x29\x01",
+    /* INFO_CONF */ [0x1a] = "\x03\x23\x01",
+    /* FACILITY_CONF */ [0x1b] = "\x03\x23\x1f\x1b\x01",
+    /* SELECT_B_PROTOCOL_CONF */ [0x1c] = "\x03\x23\x01",
+    /* CONNECT_B3_CONF */ [0x1d] = "\x03\x23\x01",
+    /* DISCONNECT_B3_CONF */ [0x1f] = "\x03\x23\x01",
+    /* DATA_B3_CONF */ [0x21] = "\x03\x19\x23\x01",
+    /* RESET_B3_CONF */ [0x22] = "\x03\x23\x01",
+    /* CONNECT_IND */ [0x26] = "\x03\x14\x0e\x10\x0f\x11\x0b\x28\x22\x04\x0c\x27\x2f\x1c\x01\x01",
+    /* CONNECT_ACTIVE_IND */ [0x27] = "\x03\x16\x17\x28\x01",
+    /* DISCONNECT_IND */ [0x28] = "\x03\x2c\x01",
+    /* MANUFACTURER_CONF */ [0x2a] = "\x03\x2a\x15\x21\x29\x01",
+    /* INFO_IND */ [0x2c] = "\x03\x26\x24\x01",
+    /* FACILITY_IND */ [0x2d] = "\x03\x1f\x1d\x01",
+    /* CONNECT_B3_IND */ [0x2f] = "\x03\x2b\x01",
+    /* CONNECT_B3_ACTIVE_IND */ [0x30] = "\x03\x2b\x01",
+    /* DISCONNECT_B3_IND */ [0x31] = "\x03\x2d\x2b\x01",
+    /* DATA_B3_IND */ [0x33] = "\x03\x18\x1a\x19\x20\x01",
+    /* RESET_B3_IND */ [0x34] = "\x03\x2b\x01",
+    /* CONNECT_B3_T90_ACTIVE_IND */ [0x35] = "\x03\x2b\x01",
+    /* CONNECT_RESP */ [0x38] = "\x03\x2e\x0d\x06\x08\x0a\x05\x07\x09\x01\x16\x17\x28\x04\x0c\x27\x2f\x1c\x01\x01",
+    /* CONNECT_ACTIVE_RESP */ [0x39] = "\x03\x01",
+    /* DISCONNECT_RESP */ [0x3a] = "\x03\x01",
+    /* MANUFACTURER_IND */ [0x3c] = "\x03\x2a\x15\x21\x29\x01",
+    /* INFO_RESP */ [0x3e] = "\x03\x01",
+    /* FACILITY_RESP */ [0x3f] = "\x03\x1f\x01",
+    /* CONNECT_B3_RESP */ [0x41] = "\x03\x2e\x2b\x01",
+    /* CONNECT_B3_ACTIVE_RESP */ [0x42] = "\x03\x01",
+    /* DISCONNECT_B3_RESP */ [0x43] = "\x03\x01",
+    /* DATA_B3_RESP */ [0x45] = "\x03\x19\x01",
+    /* RESET_B3_RESP */ [0x46] = "\x03\x01",
+    /* CONNECT_B3_T90_ACTIVE_RESP */ [0x47] = "\x03\x01",
+    /* MANUFACTURER_RESP */ [0x4e] = "\x03\x2a\x15\x21\x29\x01",
 };
 
 /*-------------------------------------------------------*/
@@ -623,85 +592,54 @@ unsigned capi_cmsg_header(_cmsg * cmsg, u16 _ApplId,
 
 static char *mnames[] =
 {
-       0,
-       "ALERT_REQ",
-       "CONNECT_REQ",
-       0,
-       "DISCONNECT_REQ",
-       "LISTEN_REQ",
-       0,
-       0,
-       "INFO_REQ",
-       "FACILITY_REQ",
-       "SELECT_B_PROTOCOL_REQ",
-       "CONNECT_B3_REQ",
-       0,
-       "DISCONNECT_B3_REQ",
-       0,
-       "DATA_B3_REQ",
-       "RESET_B3_REQ",
-       0,
-       0,
-       "ALERT_CONF",
-       "CONNECT_CONF",
-       0,
-       "DISCONNECT_CONF",
-       "LISTEN_CONF",
-       "MANUFACTURER_REQ",
-       0,
-       "INFO_CONF",
-       "FACILITY_CONF",
-       "SELECT_B_PROTOCOL_CONF",
-       "CONNECT_B3_CONF",
-       0,
-       "DISCONNECT_B3_CONF",
-       0,
-       "DATA_B3_CONF",
-       "RESET_B3_CONF",
-       0,
-       0,
-       0,
-       "CONNECT_IND",
-       "CONNECT_ACTIVE_IND",
-       "DISCONNECT_IND",
-       0,
-       "MANUFACTURER_CONF",
-       0,
-       "INFO_IND",
-       "FACILITY_IND",
-       0,
-       "CONNECT_B3_IND",
-       "CONNECT_B3_ACTIVE_IND",
-       "DISCONNECT_B3_IND",
-       0,
-       "DATA_B3_IND",
-       "RESET_B3_IND",
-       "CONNECT_B3_T90_ACTIVE_IND",
-       0,
-       0,
-       "CONNECT_RESP",
-       "CONNECT_ACTIVE_RESP",
-       "DISCONNECT_RESP",
-       0,
-       "MANUFACTURER_IND",
-       0,
-       "INFO_RESP",
-       "FACILITY_RESP",
-       0,
-       "CONNECT_B3_RESP",
-       "CONNECT_B3_ACTIVE_RESP",
-       "DISCONNECT_B3_RESP",
-       0,
-       "DATA_B3_RESP",
-       "RESET_B3_RESP",
-       "CONNECT_B3_T90_ACTIVE_RESP",
-       0,
-       0,
-       0,
-       0,
-       0,
-       0,
-       "MANUFACTURER_RESP"
+       [0x01] = "ALERT_REQ",
+       [0x02] = "CONNECT_REQ",
+       [0x04] = "DISCONNECT_REQ",
+       [0x05] = "LISTEN_REQ",
+       [0x08] = "INFO_REQ",
+       [0x09] = "FACILITY_REQ",
+       [0x0a] = "SELECT_B_PROTOCOL_REQ",
+       [0x0b] = "CONNECT_B3_REQ",
+       [0x0d] = "DISCONNECT_B3_REQ",
+       [0x0f] = "DATA_B3_REQ",
+       [0x10] = "RESET_B3_REQ",
+       [0x13] = "ALERT_CONF",
+       [0x14] = "CONNECT_CONF",
+       [0x16] = "DISCONNECT_CONF",
+       [0x17] = "LISTEN_CONF",
+       [0x18] = "MANUFACTURER_REQ",
+       [0x1a] = "INFO_CONF",
+       [0x1b] = "FACILITY_CONF",
+       [0x1c] = "SELECT_B_PROTOCOL_CONF",
+       [0x1d] = "CONNECT_B3_CONF",
+       [0x1f] = "DISCONNECT_B3_CONF",
+       [0x21] = "DATA_B3_CONF",
+       [0x22] = "RESET_B3_CONF",
+       [0x26] = "CONNECT_IND",
+       [0x27] = "CONNECT_ACTIVE_IND",
+       [0x28] = "DISCONNECT_IND",
+       [0x2a] = "MANUFACTURER_CONF",
+       [0x2c] = "INFO_IND",
+       [0x2d] = "FACILITY_IND",
+       [0x2f] = "CONNECT_B3_IND",
+       [0x30] = "CONNECT_B3_ACTIVE_IND",
+       [0x31] = "DISCONNECT_B3_IND",
+       [0x33] = "DATA_B3_IND",
+       [0x34] = "RESET_B3_IND",
+       [0x35] = "CONNECT_B3_T90_ACTIVE_IND",
+       [0x38] = "CONNECT_RESP",
+       [0x39] = "CONNECT_ACTIVE_RESP",
+       [0x3a] = "DISCONNECT_RESP",
+       [0x3c] = "MANUFACTURER_IND",
+       [0x3e] = "INFO_RESP",
+       [0x3f] = "FACILITY_RESP",
+       [0x41] = "CONNECT_B3_RESP",
+       [0x42] = "CONNECT_B3_ACTIVE_RESP",
+       [0x43] = "DISCONNECT_B3_RESP",
+       [0x45] = "DATA_B3_RESP",
+       [0x46] = "RESET_B3_RESP",
+       [0x47] = "CONNECT_B3_T90_ACTIVE_RESP",
+       [0x4e] = "MANUFACTURER_RESP"
 };
 
 char *capi_cmd2str(u8 cmd, u8 subcmd)
@@ -715,9 +653,9 @@ char *capi_cmd2str(u8 cmd, u8 subcmd)
 
 static char *pnames[] =
 {
-    /*00 */ 0,
-    /*01 */ 0,
-    /*02 */ 0,
+    /*00 */ NULL,
+    /*01 */ NULL,
+    /*02 */ NULL,
     /*03 */ "Controller/PLCI/NCCI",
     /*04 */ "AdditionalInfo",
     /*05 */ "B1configuration",
@@ -767,7 +705,7 @@ static char *pnames[] =
 
 
 static char buf[8192];
-static char *p = 0;
+static char *p = NULL;
 
 #include <stdarg.h>
 
linux-2.6