[][openwrt][common][app][Refactor switch command to support switches with different design]

[Description]
Refactor switch command to support switches wtih different design.
Original switch command only support mt7530 and mt7531 switch design.
After refactor, it can also support an8855 switch design.

[Release-log]
N/A

Change-Id: I0d54e41d952a32e86ab3a79c6374a95a61bfdf73
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/8766441
diff --git a/feed/app/switch/src/switch_fun.c b/feed/app/switch/src/switch_fun.c
old mode 100755
new mode 100644
index 8ee9675..9e9f4fe
--- a/feed/app/switch/src/switch_fun.c
+++ b/feed/app/switch/src/switch_fun.c
@@ -19,6 +19,82 @@
 
 #define leaky_bucket 0
 
+struct switch_func_s mt753x_switch_func = {
+	.pf_table_dump = table_dump,
+	.pf_table_clear = table_clear,
+	.pf_switch_reset = switch_reset,
+	.pf_doArlAging = doArlAging,
+	.pf_read_mib_counters = read_mib_counters,
+	.pf_clear_mib_counters = clear_mib_counters,
+	.pf_read_output_queue_counters = read_output_queue_counters,
+	.pf_read_free_page_counters = read_free_page_counters,
+	.pf_rate_control = rate_control,
+	.pf_igress_rate_set = ingress_rate_set,
+	.pf_egress_rate_set = egress_rate_set,
+	.pf_table_add = table_add,
+	.pf_table_del_fid = table_del_fid,
+	.pf_table_del_vid = table_del_vid,
+	.pf_table_search_mac_fid = table_search_mac_fid,
+	.pf_table_search_mac_vid = table_search_mac_vid,
+	.pf_global_set_mac_fc = global_set_mac_fc,
+	.pf_set_mac_pfc = set_mac_pfc,
+	.pf_qos_sch_select = qos_sch_select,
+	.pf_qos_set_base = qos_set_base,
+	.pf_qos_wfq_set_weight = qos_wfq_set_weight,
+	.pf_qos_set_portpri = qos_set_portpri,
+	.pf_qos_set_dscppri = qos_set_dscppri,
+	.pf_qos_pri_mapping_queue = qos_pri_mapping_queue,
+	.pf_doStp = doStp,
+	.pf_sip_dump = sip_dump,
+	.pf_sip_add = sip_add,
+	.pf_sip_del = sip_del,
+	.pf_sip_clear = sip_clear,
+	.pf_dip_dump = dip_dump,
+	.pf_dip_add = dip_add,
+	.pf_dip_del = dip_del,
+	.pf_dip_clear = dip_clear,
+	.pf_set_mirror_to = set_mirror_to,
+	.pf_set_mirror_from = set_mirror_from,
+	.pf_doMirrorEn = doMirrorEn,
+	.pf_doMirrorPortBased = doMirrorPortBased,
+	.pf_acl_dip_add = acl_dip_add,
+	.pf_acl_dip_modify = acl_dip_modify,
+	.pf_acl_dip_pppoe = acl_dip_pppoe,
+	.pf_acl_dip_trtcm = acl_dip_trtcm,
+	.pf_acl_dip_meter = acl_dip_meter,
+	.pf_acl_mac_add = acl_mac_add,
+	.pf_acl_ethertype = acl_ethertype,
+	.pf_acl_sp_add = acl_sp_add,
+	.pf_acl_l4_add = acl_l4_add,
+	.pf_acl_port_enable = acl_port_enable,
+	.pf_acl_table_add = acl_table_add,
+	.pf_acl_mask_table_add = acl_mask_table_add,
+	.pf_acl_rule_table_add = acl_rule_table_add,
+	.pf_acl_rate_table_add = acl_rate_table_add,
+	.pf_vlan_dump = vlan_dump,
+	.pf_vlan_set = vlan_set,
+	.pf_vlan_clear = vlan_clear,
+	.pf_doVlanSetVid = doVlanSetVid,
+	.pf_doVlanSetPvid = doVlanSetPvid,
+	.pf_doVlanSetAccFrm = doVlanSetAccFrm,
+	.pf_doVlanSetPortAttr = doVlanSetPortAttr,
+	.pf_doVlanSetPortMode = doVlanSetPortMode,
+	.pf_doVlanSetEgressTagPCR = doVlanSetEgressTagPCR,
+	.pf_doVlanSetEgressTagPVC = doVlanSetEgressTagPVC,
+	.pf_igmp_on = igmp_on,
+	.pf_igmp_off = igmp_off,
+	.pf_igmp_enable = igmp_enable,
+	.pf_igmp_disable = igmp_disable,
+	.pf_collision_pool_enable = collision_pool_enable,
+	.pf_collision_pool_mac_dump = collision_pool_mac_dump,
+	.pf_collision_pool_dip_dump = collision_pool_dip_dump,
+	.pf_collision_pool_sip_dump = collision_pool_sip_dump,
+	.pf_pfc_get_rx_counter = pfc_get_rx_counter,
+	.pf_pfc_get_tx_counter = pfc_get_tx_counter,
+	.pf_eee_enable = eee_enable,
+	.pf_eee_dump = eee_dump,
+};
+
 static int getnext(char *src, int separator, char *dest)
 {
 	char *c;
@@ -66,7 +142,7 @@
 	c[1] = *(ptr + 1);
 	c[2] = *(ptr + 2);
 	c[3] = *(ptr + 3);
-	/*sprintf(str, "%d.%d.%d.%d", c[0], c[1], c[2], c[3]);*/
+	/*sprintf(str, "%d.%d.%d.%d", c[0], c[1], c[2], c[3]); */
 	sprintf(str, "%d.%d.%d.%d", c[3], c[2], c[1], c[0]);
 }
 
@@ -153,7 +229,8 @@
 	return 0;
 }
 
-int mii_mgr_c45_read(unsigned int port_num, unsigned int dev, unsigned int reg, unsigned int *value)
+int mii_mgr_c45_read(unsigned int port_num, unsigned int dev, unsigned int reg,
+		     unsigned int *value)
 {
 	int ret;
 
@@ -176,7 +253,8 @@
 	return 0;
 }
 
-int mii_mgr_c45_write(unsigned int port_num, unsigned int dev, unsigned int reg, unsigned int value)
+int mii_mgr_c45_write(unsigned int port_num, unsigned int dev, unsigned int reg,
+		      unsigned int value)
 {
 	int ret;
 
@@ -199,7 +277,6 @@
 	return 0;
 }
 
-
 int phy_dump(int phy_addr)
 {
 	int ret;
@@ -221,7 +298,7 @@
 void phy_crossover(int argc, char *argv[])
 {
 	unsigned int port_num = strtoul(argv[2], NULL, 10);
-	unsigned int value;
+	unsigned int value = 0;
 	int ret;
 
 	if (port_num > 4) {
@@ -230,9 +307,13 @@
 	}
 
 	if (nl_init_flag == true)
-		ret = phy_cl45_read_netlink(attres, port_num, 0x1E, MT7530_T10_TEST_CONTROL, &value);
+		ret =
+		    phy_cl45_read_netlink(attres, port_num, 0x1E,
+					  MT7530_T10_TEST_CONTROL, &value);
 	else
-		ret = mii_mgr_cl45_read_ioctl(port_num, 0x1E, MT7530_T10_TEST_CONTROL, &value);
+		ret =
+		    mii_mgr_cl45_read_ioctl(port_num, 0x1E,
+					    MT7530_T10_TEST_CONTROL, &value);
 	if (ret < 0) {
 		printf("phy_cl45 read fail\n");
 		exit_free();
@@ -240,10 +321,10 @@
 	}
 
 	printf("mii_mgr_cl45:");
-	printf("Read:  port#=%d, device=0x%x, reg=0x%x, value=0x%x\n", port_num, 0x1E, MT7530_T10_TEST_CONTROL, value);
+	printf("Read:  port#=%d, device=0x%x, reg=0x%x, value=0x%x\n", port_num,
+	       0x1E, MT7530_T10_TEST_CONTROL, value);
 
-	if (!strncmp(argv[3], "auto", 5))
-	{
+	if (!strncmp(argv[3], "auto", 5)) {
 		value &= (~(0x3 << 3));
 	} else if (!strncmp(argv[3], "mdi", 4)) {
 		value &= (~(0x3 << 3));
@@ -254,12 +335,17 @@
 		printf("invaild parameter\n");
 		return;
 	}
-	printf("Write: port#=%d, device=0x%x, reg=0x%x. value=0x%x\n", port_num, 0x1E, MT7530_T10_TEST_CONTROL, value);
+	printf("Write: port#=%d, device=0x%x, reg=0x%x. value=0x%x\n", port_num,
+	       0x1E, MT7530_T10_TEST_CONTROL, value);
 
 	if (nl_init_flag == true)
-		ret = phy_cl45_write_netlink(attres, port_num, 0x1E, MT7530_T10_TEST_CONTROL, value);
+		ret =
+		    phy_cl45_write_netlink(attres, port_num, 0x1E,
+					   MT7530_T10_TEST_CONTROL, value);
 	else
-		ret = mii_mgr_cl45_write_ioctl(port_num, 0x1E, MT7530_T10_TEST_CONTROL, value);
+		ret =
+		    mii_mgr_cl45_write_ioctl(port_num, 0x1E,
+					     MT7530_T10_TEST_CONTROL, value);
 
 	if (ret < 0) {
 		printf("phy_cl45 write fail\n");
@@ -282,7 +368,7 @@
 	if (argv[2][0] == 'r') {
 		if (argc != 7)
 			return -1;
-		mii_mgr_write(0, 0x1f, 0x52b5); // r31 = 0x52b5
+		mii_mgr_write(0, 0x1f, 0x52b5);	// r31 = 0x52b5
 		port_num = strtoul(argv[3], NULL, 0);
 		if (port_num > MAX_PORT) {
 			printf("Illegal port index and port:0~6\n");
@@ -291,16 +377,21 @@
 		ch_addr = strtoul(argv[4], NULL, 0);
 		node_addr = strtoul(argv[5], NULL, 0);
 		data_addr = strtoul(argv[6], NULL, 0);
-		printf("port = %x, ch_addr = %x, node_addr=%x, data_addr=%x\n", port_num, ch_addr, node_addr, data_addr);
-		tr_reg_control = (1 << 15) | (1 << 13) | (ch_addr << 11) | (node_addr << 7) | (data_addr << 1);
-		mii_mgr_write(port_num, 16, tr_reg_control); // r16 = tr_reg_control
+		printf("port = %x, ch_addr = %x, node_addr=%x, data_addr=%x\n",
+		       port_num, ch_addr, node_addr, data_addr);
+		tr_reg_control =
+		    (1 << 15) | (1 << 13) | (ch_addr << 11) | (node_addr << 7) |
+		    (data_addr << 1);
+		mii_mgr_write(port_num, 16, tr_reg_control);	// r16 = tr_reg_control
 		mii_mgr_read(port_num, 17, &val_l);
 		mii_mgr_read(port_num, 18, &val_h);
-		printf("switch trreg read tr_reg_control=%x, value_H=%x, value_L=%x\n", tr_reg_control, val_h, val_l);
+		printf
+		    ("switch trreg read tr_reg_control=%x, value_H=%x, value_L=%x\n",
+		     tr_reg_control, val_h, val_l);
 	} else if (argv[2][0] == 'w') {
 		if (argc != 9)
 			return -1;
-		mii_mgr_write(0, 0x1f, 0x52b5); // r31 = 0x52b5
+		mii_mgr_write(0, 0x1f, 0x52b5);	// r31 = 0x52b5
 		port_num = strtoul(argv[3], NULL, 0);
 		if (port_num > MAX_PORT) {
 			printf("\n**Illegal port index and port:0~6\n");
@@ -311,20 +402,26 @@
 		data_addr = strtoul(argv[6], NULL, 0);
 		val_h = strtoul(argv[7], NULL, 0);
 		val_l = strtoul(argv[8], NULL, 0);
-		printf("port = %x, ch_addr = %x, node_addr=%x, data_addr=%x\n", port_num, ch_addr, node_addr, data_addr);
-		tr_reg_control = (1 << 15) | (0 << 13) | (ch_addr << 11) | (node_addr << 7) | (data_addr << 1);
+		printf("port = %x, ch_addr = %x, node_addr=%x, data_addr=%x\n",
+		       port_num, ch_addr, node_addr, data_addr);
+		tr_reg_control =
+		    (1 << 15) | (0 << 13) | (ch_addr << 11) | (node_addr << 7) |
+		    (data_addr << 1);
 		mii_mgr_write(port_num, 17, val_l);
 		mii_mgr_write(port_num, 18, val_h);
-		mii_mgr_write(port_num, 16, tr_reg_control); // r16 = tr_reg_control
-		printf("switch trreg Write tr_reg_control=%x, value_H=%x, value_L=%x\n", tr_reg_control, val_h, val_l);
+		mii_mgr_write(port_num, 16, tr_reg_control);	// r16 = tr_reg_control
+		printf
+		    ("switch trreg Write tr_reg_control=%x, value_H=%x, value_L=%x\n",
+		     tr_reg_control, val_h, val_l);
 	} else
 		return -1;
 	return 0;
 }
 
-void write_acl_table(unsigned char tbl_idx, unsigned int vawd1, unsigned int vawd2)
+void write_acl_table(unsigned char tbl_idx, unsigned int vawd1,
+		     unsigned int vawd2)
 {
-	unsigned int value, reg;
+	unsigned int value = 0, reg = 0;
 	unsigned int max_index;
 
 	if (chip_name == 0x7531 || chip_name == 0x7988)
@@ -340,8 +437,7 @@
 	}
 
 	reg = REG_VTCR_ADDR;
-	while (1)
-	{ // wait until not busy
+	while (1) {		// wait until not busy
 		reg_read(reg, &value);
 		if ((value & REG_VTCR_BUSY_MASK) == 0) {
 			break;
@@ -356,8 +452,7 @@
 	reg_write(reg, value);
 	printf("write reg: %x, value: %x\n", reg, value);
 
-	while (1)
-	{ 	// wait until not busy
+	while (1) {		// wait until not busy
 		reg_read(reg, &value);
 		if ((value & REG_VTCR_BUSY_MASK) == 0)
 			break;
@@ -366,8 +461,8 @@
 
 void acl_table_add(int argc, char *argv[])
 {
-	unsigned int vawd1, vawd2;
-	unsigned char tbl_idx;
+	unsigned int vawd1 = 0, vawd2 = 0;
+	unsigned char tbl_idx = 0;
 
 	tbl_idx = atoi(argv[3]);
 	vawd1 = strtoul(argv[4], (char **)NULL, 16);
@@ -375,10 +470,11 @@
 	write_acl_table(tbl_idx, vawd1, vawd2);
 }
 
-void write_acl_mask_table(unsigned char tbl_idx, unsigned int vawd1, unsigned int vawd2)
+void write_acl_mask_table(unsigned char tbl_idx, unsigned int vawd1,
+			  unsigned int vawd2)
 {
-	unsigned int value, reg;
-	unsigned int max_index;
+	unsigned int value = 0, reg = 0;
+	unsigned int max_index = 0;
 
 	if (chip_name == 0x7531 || chip_name == 0x7988)
 		max_index = 128;
@@ -392,8 +488,7 @@
 		return;
 	}
 	reg = REG_VTCR_ADDR;
-	while (1)
-	{ // wait until not busy
+	while (1) {		// wait until not busy
 		reg_read(reg, &value);
 		if ((value & REG_VTCR_BUSY_MASK) == 0)
 			break;
@@ -406,8 +501,7 @@
 	value = REG_VTCR_BUSY_MASK | (0x09 << REG_VTCR_FUNC_OFFT) | tbl_idx;
 	reg_write(reg, value);
 	printf("write reg: %x, value: %x\n", reg, value);
-	while (1)
-	{ // wait until not busy
+	while (1) {		// wait until not busy
 		reg_read(reg, &value);
 		if ((value & REG_VTCR_BUSY_MASK) == 0)
 			break;
@@ -416,8 +510,8 @@
 
 void acl_mask_table_add(int argc, char *argv[])
 {
-	unsigned int vawd1, vawd2;
-	unsigned char tbl_idx;
+	unsigned int vawd1 = 0, vawd2 = 0;
+	unsigned char tbl_idx = 0;
 
 	tbl_idx = atoi(argv[3]);
 	vawd1 = strtoul(argv[4], (char **)NULL, 16);
@@ -425,10 +519,11 @@
 	write_acl_mask_table(tbl_idx, vawd1, vawd2);
 }
 
-void write_acl_rule_table(unsigned char tbl_idx, unsigned int vawd1, unsigned int vawd2)
+void write_acl_rule_table(unsigned char tbl_idx, unsigned int vawd1,
+			  unsigned int vawd2)
 {
-	unsigned int value, reg;
-	unsigned int max_index;
+	unsigned int value = 0, reg = 0;
+	unsigned int max_index = 0;
 
 	if (chip_name == 0x7531 || chip_name == 0x7988)
 		max_index = 128;
@@ -437,14 +532,13 @@
 
 	printf("Rule_control_tbl_idx:%d\n", tbl_idx);
 
-	if (tbl_idx >= max_index) { /*Check the input parameters is right or not.*/
+	if (tbl_idx >= max_index) {	/* Check the input parameters is right or not. */
 		printf(HELP_ACL_RULE_TBL_ADD);
 		return;
 	}
 	reg = REG_VTCR_ADDR;
 
-	while (1)
-	{ // wait until not busy
+	while (1) {		// wait until not busy
 		reg_read(reg, &value);
 		if ((value & REG_VTCR_BUSY_MASK) == 0) {
 			break;
@@ -459,8 +553,7 @@
 	reg_write(reg, value);
 	printf("write reg: %x, value: %x\n", reg, value);
 
-	while (1)
-	{ // wait until not busy
+	while (1) {		// wait until not busy
 		reg_read(reg, &value);
 		if ((value & REG_VTCR_BUSY_MASK) == 0) {
 			break;
@@ -470,8 +563,8 @@
 
 void acl_rule_table_add(int argc, char *argv[])
 {
-	unsigned int vawd1, vawd2;
-	unsigned char tbl_idx;
+	unsigned int vawd1 = 0, vawd2 = 0;
+	unsigned char tbl_idx = 0;
 
 	tbl_idx = atoi(argv[3]);
 	vawd1 = strtoul(argv[4], (char **)NULL, 16);
@@ -479,9 +572,10 @@
 	write_acl_rule_table(tbl_idx, vawd1, vawd2);
 }
 
-void write_rate_table(unsigned char tbl_idx, unsigned int vawd1, unsigned int vawd2)
+void write_rate_table(unsigned char tbl_idx, unsigned int vawd1,
+		      unsigned int vawd2)
 {
-	unsigned int value, reg;
+	unsigned int value = 0, reg = 0;
 	unsigned int max_index = 32;
 
 	printf("Rule_action_tbl_idx:%d\n", tbl_idx);
@@ -492,7 +586,7 @@
 	}
 
 	reg = REG_VTCR_ADDR;
-	while (1) { 	// wait until not busy
+	while (1) {		// wait until not busy
 		reg_read(reg, &value);
 		if ((value & REG_VTCR_BUSY_MASK) == 0)
 			break;
@@ -507,7 +601,7 @@
 	reg_write(reg, value);
 	printf("write reg: %x, value: %x\n", reg, value);
 
-	while (1) { // wait until not busy
+	while (1) {		// wait until not busy
 		reg_read(reg, &value);
 		if ((value & REG_VTCR_BUSY_MASK) == 0)
 			break;
@@ -516,8 +610,8 @@
 
 void acl_rate_table_add(int argc, char *argv[])
 {
-	unsigned int vawd1, vawd2;
-	unsigned char tbl_idx;
+	unsigned int vawd1 = 0, vawd2 = 0;
+	unsigned char tbl_idx = 0;
 
 	tbl_idx = atoi(argv[3]);
 	vawd1 = strtoul(argv[4], (char **)NULL, 16);
@@ -526,9 +620,10 @@
 	write_rate_table(tbl_idx, vawd1, vawd2);
 }
 
-void write_trTCM_table(unsigned char tbl_idx, unsigned int vawd1, unsigned int vawd2)
+void write_trTCM_table(unsigned char tbl_idx, unsigned int vawd1,
+		       unsigned int vawd2)
 {
-	unsigned int value, reg;
+	unsigned int value = 0, reg = 0;
 	unsigned int max_index = 32;
 
 	printf("trTCM_tbl_idx:%d\n", tbl_idx);
@@ -539,7 +634,7 @@
 	}
 
 	reg = REG_VTCR_ADDR;
-	while (1) { 	// wait until not busy
+	while (1) {		// wait until not busy
 		reg_read(reg, &value);
 		if ((value & REG_VTCR_BUSY_MASK) == 0)
 			break;
@@ -554,16 +649,17 @@
 	reg_write(reg, value);
 	printf("write reg: %x, value: %x\n", reg, value);
 
-	while (1) { // wait until not busy
+	while (1) {		// wait until not busy
 		reg_read(reg, &value);
 		if ((value & REG_VTCR_BUSY_MASK) == 0)
 			break;
 	}
 }
 
-int acl_parameters_pre_del(int len1, int len2, int argc, char *argv[], int *port)
+int acl_parameters_pre_del(int len1, int len2, int argc, char *argv[],
+			   int *port)
 {
-	int i;
+	int i = 0;
 
 	*port = 0;
 	if (argc < len1) {
@@ -571,10 +667,11 @@
 		return -1;
 	}
 
-	if (len2 == 12)
-	{
+	if (len2 == 12) {
 		if (!argv[4] || strlen(argv[4]) != len2) {
-			printf("The [%s] format error, should be of length %d\n",argv[4], len2);
+			printf
+			    ("The [%s] format error, should be of length %d\n",
+			     argv[4], len2);
 			return -1;
 		}
 	}
@@ -586,7 +683,8 @@
 
 	for (i = 0; i < 7; i++) {
 		if (argv[5][i] != '0' && argv[5][i] != '1') {
-			printf("portmap format error, should be of combination of 0 or 1\n");
+			printf
+			    ("portmap format error, should be of combination of 0 or 1\n");
 			return -1;
 		}
 		*port += (argv[5][i] - '0') * (1 << i);
@@ -594,31 +692,32 @@
 	return 0;
 }
 
-void acl_compare_pattern(int ports, int comparion, int base, int word, unsigned char table_index)
+void acl_compare_pattern(int ports, int comparion, int base, int word,
+			 unsigned char table_index)
 {
-	unsigned int value;
+	unsigned int value = 0;
 
-	comparion |= 0xffff0000; //compare mask
+	comparion |= 0xffff0000;	//compare mask
 
-	value = ports << 8; //w_port_map
-	value |= 0x1 << 19; //enable
-	value |= base << 16; //mac header
-	value |= word << 1;  //word offset
+	value = ports << 8;	//w_port_map
+	value |= 0x1 << 19;	//enable
+	value |= base << 16;	//mac header
+	value |= word << 1;	//word offset
 
 	write_acl_table(table_index, comparion, value);
 }
 
 void acl_mac_add(int argc, char *argv[])
 {
-	unsigned int value;
-	int ports;
+	unsigned int value = 0;
+	int ports = 0;
 	char tmpstr[5];
 	int ret;
 
 	ret = acl_parameters_pre_del(6, 12, argc, argv, &ports);
 	if (ret < 0)
 		return;
-	//set pattern
+	/* Set pattern */
 	strncpy(tmpstr, argv[4], 4);
 	tmpstr[4] = '\0';
 	value = strtoul(tmpstr, NULL, 16);
@@ -635,20 +734,20 @@
 	acl_compare_pattern(ports, value, 0x0, 2, 2);
 
 	//set mask
-	write_acl_mask_table(0,0x7,0);
+	write_acl_mask_table(0, 0x7, 0);
 
 	//set action
-	value = 0x7;      //drop
-	value |= 1 << 28; //acl intterupt enable
-	value |= 1 << 27; //acl hit count
-	value |= 2 << 24; //acl hit count group index (0~3)
-	write_acl_rule_table(0,value,0);
+	value = 0x7;		//drop
+	value |= 1 << 28;	//acl intterupt enable
+	value |= 1 << 27;	//acl hit count
+	value |= 2 << 24;	//acl hit count group index (0~3)
+	write_acl_rule_table(0, value, 0);
 }
 
 void acl_dip_meter(int argc, char *argv[])
 {
-	unsigned int value, ip_value, meter;
-	int ports;
+	unsigned int value = 0, ip_value = 0, meter = 0;
+	int ports = 0;
 	int ret;
 
 	ip_value = 0;
@@ -666,31 +765,31 @@
 	acl_compare_pattern(ports, value, 0x2, 0x9, 1);
 
 	//set mask
-	write_acl_mask_table(0,0x3,0);
+	write_acl_mask_table(0, 0x3, 0);
 
 	//set action
 	meter = strtoul(argv[6], NULL, 0);
 	if (((chip_name == 0x7530) && (meter > 1000000)) ||
-		((chip_name == 0x7531) && (meter > 2500000)) ||
-		((chip_name == 0x7988) && (meter > 4000000))) {
+	    ((chip_name == 0x7531) && (meter > 2500000)) ||
+	    ((chip_name == 0x7988) && (meter > 4000000))) {
 		printf("\n**Illegal meter input, and 7530: 0~1000000Kpbs, 7531: 0~2500000Kpbs, 7988: 0~4000000Kpbs**\n");
 		return;
 	}
 	if (((chip_name == 0x7531 || chip_name == 0x7988) && (meter > 1000000))) {
-		reg_read(0xc,&value);
+		reg_read(0xc, &value);
 		value |= 0x1 << 30;
-		reg_write(0xC,value);
-		printf("AGC: 0x%x\n",value);
-		value = meter / 1000; //uint is 1Mbps
+		reg_write(0xC, value);
+		printf("AGC: 0x%x\n", value);
+		value = meter / 1000;	//uint is 1Mbps
 	} else {
-		reg_read(0xc,&value);
+		reg_read(0xc, &value);
 		value &= ~(0x1 << 30);
-		reg_write(0xC,value);
-		printf("AGC: 0x%x\n",value);
-		value = meter >> 6; //uint is 64Kbps
+		reg_write(0xC, value);
+		printf("AGC: 0x%x\n", value);
+		value = meter >> 6;	//uint is 64Kbps
 	}
-	value |= 0x1 << 15; //enable rate control
-	printf("Acl rate control:0x%x\n",value);
+	value |= 0x1 << 15;	//enable rate control
+	printf("Acl rate control:0x%x\n", value);
 	write_rate_table(0, value, 0);
 }
 
@@ -721,30 +820,30 @@
 	PIR = strtoul(argv[8], NULL, 0);
 	PBS = strtoul(argv[9], NULL, 0);
 
-	if (CIR > 65535*64 || CBS > 65535 || PIR > 65535*64  || PBS > 65535) {
+	if (CIR > 65535 * 64 || CBS > 65535 || PIR > 65535 * 64 || PBS > 65535) {
 		printf("\n**Illegal input parameters**\n");
 		return;
 	}
 
-	value = CBS << 16; //bit16~31
-	value |= PBS;      //bit0~15
-			   //value |= 1;//valid
+	value = CBS << 16;	//bit16~31
+	value |= PBS;		//bit0~15
+	//value |= 1;//valid
 	CIR = CIR >> 6;
 	PIR = PIR >> 6;
 
-	value2 = CIR << 16; //bit16~31
-	value2 |= PIR;      //bit0~15
-	write_trTCM_table(0,value,value2);
+	value2 = CIR << 16;	//bit16~31
+	value2 |= PIR;		//bit0~15
+	write_trTCM_table(0, value, value2);
 
 	//set pattern
-	write_acl_mask_table(0,0x3,0);
+	write_acl_mask_table(0, 0x3, 0);
 
 	//set action
-	value = 0x1 << (11 + 1); //TrTCM green  meter#0 Low drop
-	value |= 0x2 << (8 + 1); //TrTCM yellow  meter#0 Med drop
-	value |= 0x3 << (5 + 1); //TrTCM red  meter#0    Hig drop
-	value |= 0x1 << 0;       //TrTCM drop pcd select
-	write_acl_rule_table(0,0,value);
+	value = 0x1 << (11 + 1);	//TrTCM green  meter#0 Low drop
+	value |= 0x2 << (8 + 1);	//TrTCM yellow  meter#0 Med drop
+	value |= 0x3 << (5 + 1);	//TrTCM red  meter#0    Hig drop
+	value |= 0x1 << 0;	//TrTCM drop pcd select
+	write_acl_rule_table(0, 0, value);
 }
 
 void acl_ethertype(int argc, char *argv[])
@@ -756,21 +855,21 @@
 	ret = acl_parameters_pre_del(6, -1, argc, argv, &ports);
 	if (ret < 0)
 		return;
-	printf("ports:0x%x\n",ports);
+	printf("ports:0x%x\n", ports);
 	ethertype = strtoul(argv[4], NULL, 16);
 	//set pattern
 	value = ethertype;
 	acl_compare_pattern(ports, value, 0x0, 0x6, 0);
 
 	//set pattern
-	write_acl_mask_table(0,0x1,0);
+	write_acl_mask_table(0, 0x1, 0);
 
 	//set action(drop)
-	value = 0x7;      //default. Nodrop
-	value |= 1 << 28; //acl intterupt enable
-	value |= 1 << 27; //acl hit count
+	value = 0x7;		//default. Nodrop
+	value |= 1 << 28;	//acl intterupt enable
+	value |= 1 << 27;	//acl hit count
 
-	write_acl_rule_table(0,value,0);
+	write_acl_rule_table(0, value, 0);
 }
 
 void acl_dip_modify(int argc, char *argv[])
@@ -801,14 +900,14 @@
 	acl_compare_pattern(ports, value, 0x2, 0x9, 1);
 
 	//set pattern
-	write_acl_mask_table(0,0x3,0);
+	write_acl_mask_table(0, 0x3, 0);
 
 	//set action
-	value = 0x0;      //default. Nodrop
-	value |= 1 << 28; //acl intterupt enable
-	value |= 1 << 27; //acl hit count
-	value |= priority << 4;  //acl UP
-	write_acl_rule_table(0,value,0);
+	value = 0x0;		//default. Nodrop
+	value |= 1 << 28;	//acl intterupt enable
+	value |= 1 << 27;	//acl hit count
+	value |= priority << 4;	//acl UP
+	write_acl_rule_table(0, value, 0);
 }
 
 void acl_dip_pppoe(int argc, char *argv[])
@@ -832,16 +931,16 @@
 	acl_compare_pattern(ports, value, 0x2, 0x9, 1);
 
 	//set pattern
-	write_acl_mask_table(0,0x3,0);
+	write_acl_mask_table(0, 0x3, 0);
 
 	//set action
-	value = 0x0;      //default. Nodrop
-	value |= 1 << 28; //acl intterupt enable
-	value |= 1 << 27; //acl hit count
-	value |= 1 << 20; //pppoe header remove
-	value |= 1 << 21; //SA MAC SWAP
-	value |= 1 << 22; //DA MAC SWAP
-	write_acl_rule_table(0,value,7);
+	value = 0x0;		//default. Nodrop
+	value |= 1 << 28;	//acl intterupt enable
+	value |= 1 << 27;	//acl hit count
+	value |= 1 << 20;	//pppoe header remove
+	value |= 1 << 21;	//SA MAC SWAP
+	value |= 1 << 22;	//DA MAC SWAP
+	write_acl_rule_table(0, value, 7);
 }
 
 void acl_dip_add(int argc, char *argv[])
@@ -865,20 +964,20 @@
 	acl_compare_pattern(ports, value, 0x2, 0x9, 1);
 
 	//set pattern
-	write_acl_mask_table(0,0x3,0);
+	write_acl_mask_table(0, 0x3, 0);
 
 	//set action
 	//value = 0x0; //default
-	value = 0x7;      //drop
-	value |= 1 << 28; //acl intterupt enable
-	value |= 1 << 27; //acl hit count
-	value |= 2 << 24; //acl hit count group index (0~3)
-	write_acl_rule_table(0,value,0);
+	value = 0x7;		//drop
+	value |= 1 << 28;	//acl intterupt enable
+	value |= 1 << 27;	//acl hit count
+	value |= 2 << 24;	//acl hit count group index (0~3)
+	write_acl_rule_table(0, value, 0);
 }
 
 void acl_l4_add(int argc, char *argv[])
 {
-	unsigned int value;
+	unsigned int value = 0;
 	int ports;
 	int ret;
 
@@ -891,16 +990,16 @@
 	acl_compare_pattern(ports, value, 0x5, 0x0, 0);
 
 	//set rue mask
-	write_acl_mask_table(0,0x1,0);
+	write_acl_mask_table(0, 0x1, 0);
 	//set action
-	value = 0x7; //drop
-		     //value |= 1;//valid
-	write_acl_rule_table(0,value,0);
+	value = 0x7;		//drop
+	//value |= 1;//valid
+	write_acl_rule_table(0, value, 0);
 }
 
 void acl_sp_add(int argc, char *argv[])
 {
-	unsigned int value;
+	unsigned int value = 0;
 	int ports;
 	int ret;
 
@@ -912,31 +1011,31 @@
 	acl_compare_pattern(ports, value, 0x4, 0x0, 0);
 
 	//set rue mask
-	write_acl_mask_table(0,0x1,0);
+	write_acl_mask_table(0, 0x1, 0);
 
 	//set action
-	value = 0x7; //drop
-		     //value |= 1;//valid
-	write_acl_rule_table(0,value,0);
+	value = 0x7;		//drop
+	//value |= 1;//valid
+	write_acl_rule_table(0, value, 0);
 }
 
 void acl_port_enable(int argc, char *argv[])
 {
-	unsigned int value, reg;
-	unsigned char acl_port, acl_en;
+	unsigned int value = 0, reg = 0;
+	unsigned char acl_port = 0, acl_en = 0;
 
 	acl_port = atoi(argv[3]);
 	acl_en = atoi(argv[4]);
 
 	printf("acl_port:%d, acl_en:%d\n", acl_port, acl_en);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if ((acl_port > SWITCH_MAX_PORT) || (acl_en > 1)) {
 		printf(HELP_ACL_SETPORTEN);
 		return;
 	}
 
-	reg = REG_PCR_P0_ADDR + (0x100 * acl_port); // 0x2004[10]
+	reg = REG_PCR_P0_ADDR + (0x100 * acl_port);	// 0x2004[10]
 	reg_read(reg, &value);
 	value &= (~REG_PORT_ACL_EN_MASK);
 	value |= (acl_en << REG_PORT_ACL_EN_OFFT);
@@ -948,37 +1047,37 @@
 static void dip_dump_internal(int type)
 {
 	unsigned int i, j, value, mac, mac2, value2;
-	char tmpstr[16];
+	char tmpstr[16] = { 0 };
 	int table_size = 0;
 	int hit_value1 = 0;
 	int hit_value2 = 0;
 
-	if(type == GENERAL_TABLE) {
+	if (type == GENERAL_TABLE) {
 		table_size = 0x800;
-		reg_write(REG_ATC_ADDR, 0x8104); //dip search command
-		} else {
+		reg_write(REG_ATC_ADDR, 0x8104);	//dip search command
+	} else {
 		table_size = 0x40;
-		reg_write(REG_ATC_ADDR, 0x811c); //dip search command
+		reg_write(REG_ATC_ADDR, 0x811c);	//dip search command
 	}
-	printf("hash   port(0:6)   rsp_cnt  flag  timer    dip-address       ATRD\n");
+	printf
+	    ("hash   port(0:6)   rsp_cnt  flag  timer    dip-address       ATRD\n");
 	for (i = 0; i < table_size; i++) {
-		while (1)
-		{
+		while (1) {
 			reg_read(REG_ATC_ADDR, &value);
-			if(type == GENERAL_TABLE) {
+			if (type == GENERAL_TABLE) {
 				hit_value1 = value & (0x1 << 13);
 				hit_value2 = 1;
-			}else {
+			} else {
 				hit_value1 = value & (0x1 << 13);
 				hit_value2 = value & (0x1 << 28);
 			}
 
-			if (hit_value1 && hit_value2 ) { //search_rdy
+			if (hit_value1 && hit_value2) {	//search_rdy
 				reg_read(REG_ATRD_ADDR, &value2);
 				//printf("REG_ATRD_ADDR=0x%x\n\r",value2);
 
-				printf("%03x:   ", (value >> 16) & 0xfff); //hash_addr_lu
-				j = (value2 >> 4) & 0xff;		   //r_port_map
+				printf("%03x:   ", (value >> 16) & 0xfff);	//hash_addr_lu
+				j = (value2 >> 4) & 0xff;	//r_port_map
 				printf("%c", (j & 0x01) ? '1' : '-');
 				printf("%c", (j & 0x02) ? '1' : '-');
 				printf("%c", (j & 0x04) ? '1' : '-');
@@ -989,38 +1088,38 @@
 
 				reg_read(REG_TSRA2_ADDR, &mac2);
 
-				printf("     0x%4x", (mac2 & 0xffff));    //RESP_CNT
-				printf("  0x%2x", ((mac2 >> 16) & 0xff)); //RESP_FLAG
-				printf("  %3d", ((mac2 >> 24) & 0xff));   //RESP_TIMER
-									  //printf(" %4d", (value2 >> 24) & 0xff); //r_age_field
+				printf("     0x%4x", (mac2 & 0xffff));	//RESP_CNT
+				printf("  0x%2x", ((mac2 >> 16) & 0xff));	//RESP_FLAG
+				printf("  %3d", ((mac2 >> 24) & 0xff));	//RESP_TIMER
+				//printf(" %4d", (value2 >> 24) & 0xff); //r_age_field
 				reg_read(REG_TSRA1_ADDR, &mac);
 				ip_to_str(tmpstr, mac);
 				printf("     %s", tmpstr);
-				printf("  0x%8x\n", value2); //ATRD
-							     //printf("%04x", ((mac2 >> 16) & 0xffff));
-							     //printf("     %c\n", (((value2 >> 20) & 0x03)== 0x03)? 'y':'-');
+				printf("  0x%8x\n", value2);	//ATRD
+				//printf("%04x", ((mac2 >> 16) & 0xffff));
+				//printf("     %c\n", (((value2 >> 20) & 0x03)== 0x03)? 'y':'-');
 				if (value & 0x4000) {
 					printf("end of table %d\n", i);
 					return;
 				}
 				break;
-			}
-			else if (value & 0x4000) { //at_table_end
-				printf("found the last entry %d (not ready)\n", i);
+			} else if (value & 0x4000) {	//at_table_end
+				printf("found the last entry %d (not ready)\n",
+				       i);
 				return;
 			}
 			usleep(5000);
 		}
 
-		if(type == GENERAL_TABLE)
-			reg_write(REG_ATC_ADDR, 0x8105); //search for next dip address
+		if (type == GENERAL_TABLE)
+			reg_write(REG_ATC_ADDR, 0x8105);	//search for next dip address
 		else
-			reg_write(REG_ATC_ADDR, 0x811d); //search for next dip address
+			reg_write(REG_ATC_ADDR, 0x811d);	//search for next dip address
 		usleep(5000);
 	}
 }
 
-void dip_dump(void)
+void dip_dump(int argc, char *argv[])
 {
 	dip_dump_internal(GENERAL_TABLE);
 
@@ -1029,7 +1128,7 @@
 void dip_add(int argc, char *argv[])
 {
 	unsigned int value = 0;
-	unsigned int i, j;
+	unsigned int i = 0, j = 0;
 
 	value = 0;
 
@@ -1049,13 +1148,14 @@
 	j = 0;
 	for (i = 0; i < 7; i++) {
 		if (argv[4][i] != '0' && argv[4][i] != '1') {
-			printf("portmap format error, should be of combination of 0 or 1\n");
+			printf
+			    ("portmap format error, should be of combination of 0 or 1\n");
 			return;
 		}
 		j += (argv[4][i] - '0') * (1 << i);
 	}
-	value = j << 4;      //w_port_map
-	value |= (0x3 << 2); //static
+	value = j << 4;		//w_port_map
+	value |= (0x3 << 2);	//static
 
 	reg_write(REG_ATWD_ADDR, value);
 
@@ -1063,14 +1163,14 @@
 	reg_read(REG_ATWD_ADDR, &value);
 	printf("REG_ATWD_ADDR is 0x%x\n\r", value);
 
-	value = 0x8011; //single w_dip_cmd
+	value = 0x8011;		//single w_dip_cmd
 	reg_write(REG_ATC_ADDR, value);
 
 	usleep(1000);
 
 	for (i = 0; i < 20; i++) {
 		reg_read(REG_ATC_ADDR, &value);
-		if ((value & 0x8000) == 0) { //mac address busy
+		if ((value & 0x8000) == 0) {	//mac address busy
 			printf("done.\n");
 			return;
 		}
@@ -1092,15 +1192,15 @@
 	value = 0;
 	reg_write(REG_ATA2_ADDR, value);
 
-	value = 0; //STATUS=0, delete dip
+	value = 0;		//STATUS=0, delete dip
 	reg_write(REG_ATWD_ADDR, value);
 
-	value = 0x8011; //w_dip_cmd
+	value = 0x8011;		//w_dip_cmd
 	reg_write(REG_ATC_ADDR, value);
 
 	for (i = 0; i < 20; i++) {
 		reg_read(REG_ATC_ADDR, &value);
-		if ((value & 0x8000) == 0) { //mac address busy
+		if ((value & 0x8000) == 0) {	//mac address busy
 			if (argv[1] != NULL)
 				printf("done.\n");
 			return;
@@ -1111,12 +1211,12 @@
 		printf("timeout.\n");
 }
 
-void dip_clear(void)
+void dip_clear(int argc, char *argv[])
 {
 
-	unsigned int value;
+	unsigned int value = 0;
 
-	reg_write(REG_ATC_ADDR, 0x8102); //clear all dip
+	reg_write(REG_ATC_ADDR, 0x8102);	//clear all dip
 	usleep(5000);
 	reg_read(REG_ATC_ADDR, &value);
 	printf("REG_ATC_ADDR is 0x%x\n\r", value);
@@ -1124,25 +1224,24 @@
 
 static void sip_dump_internal(int type)
 {
-	unsigned int i, j, value, mac, mac2, value2;
+	unsigned int i = 0, j = 0, value = 0, mac = 0, mac2 = 0, value2 = 0;
 	int table_size = 0;
 	int hit_value1 = 0;
 	int hit_value2 = 0;
-	char tmpstr[16];
+	char tmpstr[16] = { 0 };
 
 	if (type == GENERAL_TABLE) {
 		table_size = 0x800;
-		reg_write(REG_ATC_ADDR, 0x8204); //sip search command
-		}else {
+		reg_write(REG_ATC_ADDR, 0x8204);	//sip search command
+	} else {
 		table_size = 0x40;
-		reg_write(REG_ATC_ADDR, 0x822c); //sip search command
+		reg_write(REG_ATC_ADDR, 0x822c);	//sip search command
 	}
 	printf("hash  port(0:6)   dip-address    sip-address      ATRD\n");
 	for (i = 0; i < table_size; i++) {
-		while (1)
-		{
+		while (1) {
 			reg_read(REG_ATC_ADDR, &value);
-			if(type == GENERAL_TABLE) {
+			if (type == GENERAL_TABLE) {
 				hit_value1 = value & (0x1 << 13);
 				hit_value2 = 1;
 			} else {
@@ -1150,12 +1249,12 @@
 				hit_value2 = value & (0x1 << 28);
 			}
 
-			if (hit_value1 && hit_value2) { //search_rdy
+			if (hit_value1 && hit_value2) {	//search_rdy
 				reg_read(REG_ATRD_ADDR, &value2);
 				//printf("REG_ATRD_ADDR=0x%x\n\r",value2);
 
-				printf("%03x:  ", (value >> 16) & 0xfff); //hash_addr_lu
-				j = (value2 >> 4) & 0xff;		  //r_port_map
+				printf("%03x:  ", (value >> 16) & 0xfff);	//hash_addr_lu
+				j = (value2 >> 4) & 0xff;	//r_port_map
 				printf("%c", (j & 0x01) ? '1' : '-');
 				printf("%c", (j & 0x02) ? '1' : '-');
 				printf("%c", (j & 0x04) ? '1' : '-');
@@ -1181,42 +1280,42 @@
 					return;
 				}
 				break;
-			} else if (value & 0x4000) { //at_table_end
-				printf("found the last entry %d (not ready)\n", i);
+			} else if (value & 0x4000) {	//at_table_end
+				printf("found the last entry %d (not ready)\n",
+				       i);
 				return;
 			}
 			usleep(5000);
 		}
 
-	if(type == GENERAL_TABLE)
-		reg_write(REG_ATC_ADDR, 0x8205); //search for next sip address
-	else
-		reg_write(REG_ATC_ADDR, 0x822d); //search for next sip address
-	usleep(5000);
+		if (type == GENERAL_TABLE)
+			reg_write(REG_ATC_ADDR, 0x8205);	//search for next sip address
+		else
+			reg_write(REG_ATC_ADDR, 0x822d);	//search for next sip address
+		usleep(5000);
 	}
 }
 
-void sip_dump(void)
+void sip_dump(int argc, char *argv[])
 {
 
 	sip_dump_internal(GENERAL_TABLE);
 
 }
 
-
 void sip_add(int argc, char *argv[])
 {
-	unsigned int i, j, value;
+	unsigned int i = 0, j = 0, value = 0;
 
 	value = 0;
-	str_to_ip(&value, argv[3]); //SIP
+	str_to_ip(&value, argv[3]);	//SIP
 
 	reg_write(REG_ATA2_ADDR, value);
 	printf("REG_ATA2_ADDR is 0x%x\n\r", value);
 
 	value = 0;
 
-	str_to_ip(&value, argv[4]); //DIP
+	str_to_ip(&value, argv[4]);	//DIP
 	reg_write(REG_ATA1_ADDR, value);
 	printf("REG_ATA1_ADDR is 0x%x\n\r", value);
 
@@ -1227,13 +1326,14 @@
 	j = 0;
 	for (i = 0; i < 7; i++) {
 		if (argv[5][i] != '0' && argv[5][i] != '1') {
-			printf("portmap format error, should be of combination of 0 or 1\n");
+			printf
+			    ("portmap format error, should be of combination of 0 or 1\n");
 			return;
 		}
 		j += (argv[5][i] - '0') * (1 << i);
 	}
-	value = j << 4;      //w_port_map
-	value |= (0x3 << 2); //static
+	value = j << 4;		//w_port_map
+	value |= (0x3 << 2);	//static
 
 	reg_write(REG_ATWD_ADDR, value);
 
@@ -1241,14 +1341,14 @@
 	reg_read(REG_ATWD_ADDR, &value);
 	printf("REG_ATWD_ADDR is 0x%x\n\r", value);
 
-	value = 0x8021; //single w_sip_cmd
+	value = 0x8021;		//single w_sip_cmd
 	reg_write(REG_ATC_ADDR, value);
 
 	usleep(1000);
 
 	for (i = 0; i < 20; i++) {
 		reg_read(REG_ATC_ADDR, &value);
-		if ((value & 0x8000) == 0) { //mac address busy
+		if ((value & 0x8000) == 0) {	//mac address busy
 			printf("done.\n");
 			return;
 		}
@@ -1260,25 +1360,25 @@
 
 void sip_del(int argc, char *argv[])
 {
-	unsigned int i, value;
+	unsigned int i = 0, value = 0;
 
 	value = 0;
 	str_to_ip(&value, argv[3]);
 
-	reg_write(REG_ATA2_ADDR, value); //SIP
+	reg_write(REG_ATA2_ADDR, value);	//SIP
 
 	str_to_ip(&value, argv[4]);
-	reg_write(REG_ATA1_ADDR, value); //DIP
+	reg_write(REG_ATA1_ADDR, value);	//DIP
 
-	value = 0; //STATUS=0, delete sip
+	value = 0;		//STATUS=0, delete sip
 	reg_write(REG_ATWD_ADDR, value);
 
-	value = 0x8021; //w_sip_cmd
+	value = 0x8021;		//w_sip_cmd
 	reg_write(REG_ATC_ADDR, value);
 
 	for (i = 0; i < 20; i++) {
 		reg_read(REG_ATC_ADDR, &value);
-		if ((value & 0x8000) == 0) { //mac address busy
+		if ((value & 0x8000) == 0) {	//mac address busy
 			if (argv[1] != NULL)
 				printf("done.\n");
 			return;
@@ -1289,11 +1389,11 @@
 		printf("timeout.\n");
 }
 
-void sip_clear(void)
+void sip_clear(int argc, char *argv[])
 {
-	unsigned int value;
+	unsigned int value = 0;
 
-	reg_write(REG_ATC_ADDR, 0x8202); //clear all sip
+	reg_write(REG_ATC_ADDR, 0x8202);	//clear all sip
 	usleep(5000);
 	reg_read(REG_ATC_ADDR, &value);
 	printf("REG_ATC_ADDR is 0x%x\n\r", value);
@@ -1301,13 +1401,13 @@
 
 static void table_dump_internal(int type)
 {
-	unsigned int i, j, value, mac, mac2, value2;
+	unsigned int i = 0, j = 0, value = 0, mac = 0, mac2 = 0, value2 = 0;
 	int table_size = 0;
 	int table_end = 0;
 	int hit_value1 = 0;
 	int hit_value2 = 0;
 
-	if (type == GENERAL_TABLE){
+	if (type == GENERAL_TABLE) {
 		table_size = 0x800;
 		table_end = 0x7FF;
 		reg_write(REG_ATC_ADDR, 0x8004);
@@ -1316,13 +1416,13 @@
 		table_end = 0x3F;
 		reg_write(REG_ATC_ADDR, 0x800C);
 	}
-	printf("hash  port(0:6)   fid   vid  age(s)   mac-address     filter my_mac\n");
+	printf
+	    ("hash  port(0:6)   fid   vid  age(s)   mac-address     filter my_mac\n");
 	for (i = 0; i < table_size; i++) {
-		while (1)
-		{
+		while (1) {
 			reg_read(REG_ATC_ADDR, &value);
 			//printf("ATC =  0x%x\n", value);
-			if(type == GENERAL_TABLE) {
+			if (type == GENERAL_TABLE) {
 				hit_value1 = value & (0x1 << 13);
 				hit_value2 = 1;
 			} else {
@@ -1330,10 +1430,11 @@
 				hit_value2 = value & (0x1 << 28);
 			}
 
-			if (hit_value1 && hit_value2 && (((value >> 15) & 0x1) == 0)) {
+			if (hit_value1 && hit_value2
+			    && (((value >> 15) & 0x1) == 0)) {
 				printf("%03x:   ", (value >> 16) & 0xfff);
 				reg_read(REG_ATRD_ADDR, &value2);
-				j = (value2 >> 4) & 0xff; //r_port_map
+				j = (value2 >> 4) & 0xff;	//r_port_map
 				printf("%c", (j & 0x01) ? '1' : '-');
 				printf("%c", (j & 0x02) ? '1' : '-');
 				printf("%c", (j & 0x04) ? '1' : '-');
@@ -1345,49 +1446,52 @@
 
 				reg_read(REG_TSRA2_ADDR, &mac2);
 
-				printf("   %2d", (mac2 >> 12) & 0x7); //FID
+				printf("   %2d", (mac2 >> 12) & 0x7);	//FID
 				printf("  %4d", (mac2 & 0xfff));
 				if (((value2 >> 24) & 0xff) == 0xFF)
-					printf("   --- "); //r_age_field:static
+					printf("   --- ");	//r_age_field:static
 				else
-					printf(" %5d ", (((value2 >> 24) & 0xff)+1)*2); //r_age_field
+					printf(" %5d ", (((value2 >> 24) & 0xff) + 1) * 2);	//r_age_field
 				reg_read(REG_TSRA1_ADDR, &mac);
 				printf("  %08x", mac);
 				printf("%04x", ((mac2 >> 16) & 0xffff));
-				printf("     %c", (((value2 >> 20) & 0x03) == 0x03) ? 'y' : '-');
-				printf("     %c\n", (((value2 >> 23) & 0x01) == 0x01) ? 'y' : '-');
-				if ((value & 0x4000) && (((value >> 16) & 0xfff) == table_end)) {
+				printf("     %c",
+				       (((value2 >> 20) & 0x03) ==
+					0x03) ? 'y' : '-');
+				printf("     %c\n",
+				       (((value2 >> 23) & 0x01) ==
+					0x01) ? 'y' : '-');
+				if ((value & 0x4000)
+				    && (((value >> 16) & 0xfff) == table_end)) {
 					printf("end of table %d\n", i);
 					return;
 				}
 				break;
-			}
-			else if ((value & 0x4000) && (((value >> 15) & 0x1) == 0) && (((value >> 16) & 0xfff) == table_end)) { //at_table_end
-				printf("found the last entry %d (not ready)\n", i);
+			} else if ((value & 0x4000) && (((value >> 15) & 0x1) == 0) && (((value >> 16) & 0xfff) == table_end)) {	//at_table_end
+				printf("found the last entry %d (not ready)\n",
+				       i);
 				return;
-			}
-			else
+			} else
 				usleep(5);
 		}
 
-	if(type == GENERAL_TABLE)
-		reg_write(REG_ATC_ADDR, 0x8005);//search for next address
-	else
-		reg_write(REG_ATC_ADDR, 0x800d);//search for next address
+		if (type == GENERAL_TABLE)
+			reg_write(REG_ATC_ADDR, 0x8005);	//search for next address
+		else
+			reg_write(REG_ATC_ADDR, 0x800d);	//search for next address
 		usleep(5);
 	}
 }
 
-void table_dump(void)
+void table_dump(int argc, char *argv[])
 {
 	table_dump_internal(GENERAL_TABLE);
 
 }
 
-
 void table_add(int argc, char *argv[])
 {
-	unsigned int i, j, value, is_filter, is_mymac;
+	unsigned int i = 0, j = 0, value = 0, is_filter = 0, is_mymac = 0;
 	char tmpstr[9];
 
 	is_filter = (argv[1][0] == 'f') ? 1 : 0;
@@ -1407,7 +1511,7 @@
 
 	value = strtoul(tmpstr, NULL, 16);
 	value = (value << 16);
-	value |= (1 << 15); //IVL=1
+	value |= (1 << 15);	//IVL=1
 
 	if (argc > 4) {
 		j = strtoul(argv[4], NULL, 0);
@@ -1415,7 +1519,7 @@
 			printf("wrong vid range, should be within 0~4095\n");
 			return;
 		}
-		value |= j; //vid
+		value |= j;	//vid
 	}
 
 	reg_write(REG_ATA2_ADDR, value);
@@ -1432,12 +1536,13 @@
 	j = 0;
 	for (i = 0; i < 7; i++) {
 		if (argv[3][i] != '0' && argv[3][i] != '1') {
-			printf("portmap format error, should be of combination of 0 or 1\n");
+			printf
+			    ("portmap format error, should be of combination of 0 or 1\n");
 			return;
 		}
 		j += (argv[3][i] - '0') * (1 << i);
 	}
-	value = j << 4; //w_port_map
+	value = j << 4;		//w_port_map
 
 	if (argc > 5) {
 		j = strtoul(argv[5], NULL, 0);
@@ -1445,11 +1550,11 @@
 			printf("wrong age range, should be within 1~255\n");
 			return;
 		}
-		value |= (j << 24);  //w_age_field
-		value |= (0x1 << 2); //dynamic
+		value |= (j << 24);	//w_age_field
+		value |= (0x1 << 2);	//dynamic
 	} else {
-		value |= (0xff << 24); //w_age_field
-		value |= (0x3 << 2);   //static
+		value |= (0xff << 24);	//w_age_field
+		value |= (0x3 << 2);	//static
 	}
 
 	if (argc > 6) {
@@ -1458,11 +1563,11 @@
 			printf("wrong eg-tag range, should be within 0~7\n");
 			return;
 		}
-		value |= (j << 13); //EG_TAG
+		value |= (j << 13);	//EG_TAG
 	}
 
 	if (is_filter)
-		value |= (7 << 20); //sa_filter
+		value |= (7 << 20);	//sa_filter
 
 	if (is_mymac)
 		value |= (1 << 23);
@@ -1473,14 +1578,14 @@
 	reg_read(REG_ATWD_ADDR, &value);
 	printf("REG_ATWD_ADDR is 0x%x\n\r", value);
 
-	value = 0x8001; //w_mac_cmd
+	value = 0x8001;		//w_mac_cmd
 	reg_write(REG_ATC_ADDR, value);
 
 	usleep(1000);
 
 	for (i = 0; i < 20; i++) {
 		reg_read(REG_ATC_ADDR, &value);
-		if ((value & 0x8000) == 0) { //mac address busy
+		if ((value & 0x8000) == 0) {	//mac address busy
 			printf("done.\n");
 			return;
 		}
@@ -1492,7 +1597,7 @@
 
 void table_search_mac_vid(int argc, char *argv[])
 {
-	unsigned int i, j, value, mac, mac2, value2;
+	unsigned int i = 0, j = 0, value = 0, mac = 0, mac2 = 0, value2 = 0;
 	char tmpstr[9];
 
 	if (!argv[3] || strlen(argv[3]) != 12) {
@@ -1510,26 +1615,26 @@
 
 	value = strtoul(tmpstr, NULL, 16);
 	value = (value << 16);
-	value |= (1 << 15); //IVL=1
+	value |= (1 << 15);	//IVL=1
 
 	j = strtoul(argv[5], NULL, 0);
 	if (4095 < j) {
 		printf("wrong vid range, should be within 0~4095\n");
 		return;
 	}
-	value |= j; //vid
+	value |= j;		//vid
 
 	reg_write(REG_ATA2_ADDR, value);
 	//printf("REG_ATA2_ADDR is 0x%x\n\r",value);
 
-	value = 0x8000; //w_mac_cmd
+	value = 0x8000;		//w_mac_cmd
 	reg_write(REG_ATC_ADDR, value);
 
 	usleep(1000);
 
 	for (i = 0; i < 20; i++) {
 		reg_read(REG_ATC_ADDR, &value);
-		if ((value & 0x8000) == 0) { //mac address busy
+		if ((value & 0x8000) == 0) {	//mac address busy
 			break;
 		}
 		usleep(1000);
@@ -1545,11 +1650,12 @@
 	}
 
 	printf("search done.\n");
-	printf("hash  port(0:6)   fid   vid  age   mac-address     filter my_mac\n");
+	printf
+	    ("hash  port(0:6)   fid   vid  age   mac-address     filter my_mac\n");
 
-	printf("%03x:   ", (value >> 16) & 0xfff); //hash_addr_lu
+	printf("%03x:   ", (value >> 16) & 0xfff);	//hash_addr_lu
 	reg_read(REG_ATRD_ADDR, &value2);
-	j = (value2 >> 4) & 0xff; //r_port_map
+	j = (value2 >> 4) & 0xff;	//r_port_map
 	printf("%c", (j & 0x01) ? '1' : '-');
 	printf("%c", (j & 0x02) ? '1' : '-');
 	printf("%c", (j & 0x04) ? '1' : '-');
@@ -1561,9 +1667,9 @@
 
 	reg_read(REG_TSRA2_ADDR, &mac2);
 
-	printf("   %2d", (mac2 >> 12) & 0x7); //FID
+	printf("   %2d", (mac2 >> 12) & 0x7);	//FID
 	printf("  %4d", (mac2 & 0xfff));
-	printf(" %4d", (value2 >> 24) & 0xff); //r_age_field
+	printf(" %4d", (value2 >> 24) & 0xff);	//r_age_field
 	reg_read(REG_TSRA1_ADDR, &mac);
 	printf("  %08x", mac);
 	printf("%04x", ((mac2 >> 16) & 0xffff));
@@ -1573,7 +1679,7 @@
 
 void table_search_mac_fid(int argc, char *argv[])
 {
-	unsigned int i, j, value, mac, mac2, value2;
+	unsigned int i = 0, j = 0, value = 0, mac = 0, mac2 = 0, value2 = 0;
 	char tmpstr[9];
 
 	if (!argv[3] || strlen(argv[3]) != 12) {
@@ -1591,26 +1697,26 @@
 
 	value = strtoul(tmpstr, NULL, 16);
 	value = (value << 16);
-	value &= ~(1 << 15); //IVL=0
+	value &= ~(1 << 15);	//IVL=0
 
 	j = strtoul(argv[5], NULL, 0);
 	if (7 < j) {
 		printf("wrong fid range, should be within 0~7\n");
 		return;
 	}
-	value |= (j << 12); //vid
+	value |= (j << 12);	//vid
 
 	reg_write(REG_ATA2_ADDR, value);
 	//printf("REG_ATA2_ADDR is 0x%x\n\r",value);
 
-	value = 0x8000; //w_mac_cmd
+	value = 0x8000;		//w_mac_cmd
 	reg_write(REG_ATC_ADDR, value);
 
 	usleep(1000);
 
 	for (i = 0; i < 20; i++) {
 		reg_read(REG_ATC_ADDR, &value);
-		if ((value & 0x8000) == 0) { //mac address busy
+		if ((value & 0x8000) == 0) {	//mac address busy
 			break;
 		}
 		usleep(1000);
@@ -1626,11 +1732,12 @@
 	}
 
 	printf("search done.\n");
-	printf("hash  port(0:6)   fid   vid  age   mac-address     filter my_mac\n");
+	printf
+	    ("hash  port(0:6)   fid   vid  age   mac-address     filter my_mac\n");
 
-	printf("%03x:   ", (value >> 16) & 0xfff); //hash_addr_lu
+	printf("%03x:   ", (value >> 16) & 0xfff);	//hash_addr_lu
 	reg_read(REG_ATRD_ADDR, &value2);
-	j = (value2 >> 4) & 0xff; //r_port_map
+	j = (value2 >> 4) & 0xff;	//r_port_map
 	printf("%c", (j & 0x01) ? '1' : '-');
 	printf("%c", (j & 0x02) ? '1' : '-');
 	printf("%c", (j & 0x04) ? '1' : '-');
@@ -1642,9 +1749,9 @@
 
 	reg_read(REG_TSRA2_ADDR, &mac2);
 
-	printf("   %2d", (mac2 >> 12) & 0x7); //FID
+	printf("   %2d", (mac2 >> 12) & 0x7);	//FID
 	printf("  %4d", (mac2 & 0xfff));
-	printf(" %4d", (value2 >> 24) & 0xff); //r_age_field
+	printf(" %4d", (value2 >> 24) & 0xff);	//r_age_field
 	reg_read(REG_TSRA1_ADDR, &mac);
 	printf("  %08x", mac);
 	printf("%04x", ((mac2 >> 16) & 0xffff));
@@ -1654,7 +1761,7 @@
 
 void table_del_fid(int argc, char *argv[])
 {
-	unsigned int i, j, value;
+	unsigned int i = 0, j = 0, value = 0;
 	char tmpstr[9];
 
 	if (!argv[3] || strlen(argv[3]) != 12) {
@@ -1676,20 +1783,20 @@
 			printf("wrong fid range, should be within 0~7\n");
 			return;
 		}
-		value |= (j << 12); //fid
+		value |= (j << 12);	/* fid */
 	}
 
 	reg_write(REG_ATA2_ADDR, value);
 
-	value = 0; //STATUS=0, delete mac
+	value = 0;		/* STATUS=0, delete mac */
 	reg_write(REG_ATWD_ADDR, value);
 
-	value = 0x8001; //w_mac_cmd
+	value = 0x8001;		//w_mac_cmd
 	reg_write(REG_ATC_ADDR, value);
 
 	for (i = 0; i < 20; i++) {
 		reg_read(REG_ATC_ADDR, &value);
-		if ((value & 0x8000) == 0) { //mac address busy
+		if ((value & 0x8000) == 0) {	/* mac address busy */
 			if (argv[1] != NULL)
 				printf("done.\n");
 			return;
@@ -1702,7 +1809,7 @@
 
 void table_del_vid(int argc, char *argv[])
 {
-	unsigned int i, j, value;
+	unsigned int i = 0, j = 0, value = 0;
 	char tmpstr[9];
 
 	if (!argv[3] || strlen(argv[3]) != 12) {
@@ -1724,19 +1831,19 @@
 		printf("wrong fid range, should be within 0~4095\n");
 		return;
 	}
-	value |= j; //vid
+	value |= j;		//vid
 	value |= 1 << 15;
 	reg_write(REG_ATA2_ADDR, value);
 
-	value = 0; //STATUS=0, delete mac
+	value = 0;		//STATUS=0, delete mac
 	reg_write(REG_ATWD_ADDR, value);
 
-	value = 0x8001; //w_mac_cmd
+	value = 0x8001;		//w_mac_cmd
 	reg_write(REG_ATC_ADDR, value);
 
 	for (i = 0; i < 20; i++) {
 		reg_read(REG_ATC_ADDR, &value);
-		if ((value & 0x8000) == 0) { //mac address busy
+		if ((value & 0x8000) == 0) {	//mac address busy
 			if (argv[1] != NULL)
 				printf("done.\n");
 			return;
@@ -1747,9 +1854,10 @@
 		printf("timeout.\n");
 }
 
-void table_clear(void)
+void table_clear(int argc, char *argv[])
 {
-	unsigned int value;
+	unsigned int value = 0;
+
 	reg_write(REG_ATC_ADDR, 0x8002);
 	usleep(5000);
 	reg_read(REG_ATC_ADDR, &value);
@@ -1759,8 +1867,8 @@
 
 void set_mirror_to(int argc, char *argv[])
 {
-	unsigned int value;
-	int idx;
+	unsigned int value = 0;
+	int idx = 0;
 
 	idx = strtoul(argv[3], NULL, 0);
 	if (idx < 0 || MAX_PORT < idx) {
@@ -1788,8 +1896,8 @@
 
 void set_mirror_from(int argc, char *argv[])
 {
-	unsigned int offset, value;
-	int idx, mirror;
+	unsigned int offset = 0, value = 0;
+	int idx = 0, mirror = 0;
 
 	idx = strtoul(argv[3], NULL, 0);
 	mirror = strtoul(argv[4], NULL, 0);
@@ -1815,7 +1923,7 @@
 
 void vlan_dump(int argc, char *argv[])
 {
-	unsigned int i, j, value, value2;
+	unsigned int i = 0, j = 0, value = 0, value2 = 0;
 	int eg_tag = 0;
 
 	if (argc == 4) {
@@ -1824,17 +1932,18 @@
 	}
 
 	if (eg_tag)
-		printf("  vid  fid  portmap    s-tag\teg_tag(0:untagged 2:tagged)\n");
+		printf
+		    ("  vid  fid  portmap    s-tag\teg_tag(0:untagged 2:tagged)\n");
 	else
 		printf("  vid  fid  portmap    s-tag\n");
 
 	for (i = 1; i < 4095; i++) {
-		value = (0x80000000 + i); //r_vid_cmd
+		value = (0x80000000 + i);	//r_vid_cmd
 		reg_write(REG_VTCR_ADDR, value);
 
 		for (j = 0; j < 20; j++) {
 			reg_read(REG_VTCR_ADDR, &value);
-			if ((value & 0x80000000) == 0) { //mac address busy
+			if ((value & 0x80000000) == 0) {	//mac address busy
 				break;
 			}
 			usleep(1000);
@@ -1881,7 +1990,7 @@
 			}
 			printf("\n");
 		} else {
-			/*print 16 vid for reference information*/
+			/*print 16 vid for reference information */
 			if (i <= 16) {
 				printf(" %4d  ", i);
 				printf(" %2d ", ((value & 0xe) >> 1));
@@ -1891,7 +2000,6 @@
 	}
 }
 
-
 static long timespec_diff_us(struct timespec start, struct timespec end)
 {
 	struct timespec temp;
@@ -1904,32 +2012,31 @@
 		temp.tv_sec = end.tv_sec - start.tv_sec;
 		temp.tv_nsec = end.tv_nsec - start.tv_nsec;
 	}
-	/* calculate second part*/
+	/* calculate second part */
 	duration += temp.tv_sec * 1000000;
-	/* calculate ns part*/
+	/* calculate ns part */
 	duration += temp.tv_nsec >> 10;
 
 	return duration;
 }
 
-
 void vlan_clear(int argc, char *argv[])
 {
-	unsigned int value;
-	int vid;
+	unsigned int value = 0;
+	int vid = 0;
 	unsigned long duration_us = 0;
 	struct timespec start, end;
 
 	for (vid = 0; vid < 4096; vid++) {
 		clock_gettime(CLOCK_REALTIME, &start);
-		value = 0; //invalid
+		value = 0;	//invalid
 		reg_write(REG_VAWD1_ADDR, value);
 
-		value = (0x80001000 + vid); //w_vid_cmd
+		value = (0x80001000 + vid);	//w_vid_cmd
 		reg_write(REG_VTCR_ADDR, value);
 		while (duration_us <= 1000) {
 			reg_read(REG_VTCR_ADDR, &value);
-			if ((value & 0x80000000) == 0) { //table busy
+			if ((value & 0x80000000) == 0) {	//table busy
 				break;
 			}
 			clock_gettime(CLOCK_REALTIME, &end);
@@ -1945,7 +2052,7 @@
 	unsigned int vlan_mem = 0;
 	unsigned int value = 0;
 	unsigned int value2 = 0;
-	int i, vid, fid;
+	int i = 0, vid = 0, fid = 0;
 	int stag = 0;
 	unsigned long eg_con = 0;
 	unsigned int eg_tag = 0;
@@ -1976,7 +2083,8 @@
 	vlan_mem = 0;
 	for (i = 0; i < 8; i++) {
 		if (argv[5][i] != '0' && argv[5][i] != '1') {
-			printf("portmap format error, should be of combination of 0 or 1\n");
+			printf
+			    ("portmap format error, should be of combination of 0 or 1\n");
 			return;
 		}
 		vlan_mem += (argv[5][i] - '0') * (1 << i);
@@ -1986,7 +2094,8 @@
 	if (argc > 6) {
 		stag = strtoul(argv[6], NULL, 16);
 		if (stag < 0 || 0xfff < stag) {
-			printf("wrong stag id range, should be within 0~4095\n");
+			printf
+			    ("wrong stag id range, should be within 0~4095\n");
 			return;
 		}
 		//printf("STAG is 0x%x\n", stag);
@@ -1994,33 +2103,35 @@
 
 	/* set vlan member */
 	value |= (vlan_mem << 16);
-	value |= (1 << 30);		//IVL=1
-	value |= ((stag & 0xfff) << 4); //stag
-	value |= 1;			//valid
+	value |= (1 << 30);	//IVL=1
+	value |= ((stag & 0xfff) << 4);	//stag
+	value |= 1;		//valid
 
 	if (argc > 7) {
 		eg_con = strtoul(argv[7], NULL, 2);
 		eg_con = !!eg_con;
-		value |= (eg_con << 29); //eg_con
-		value |= (1 << 28);      //eg tag control enable
+		value |= (eg_con << 29);	//eg_con
+		value |= (1 << 28);	//eg tag control enable
 	}
 
 	if (argc > 8 && !eg_con) {
 		if (strlen(argv[8]) != 8) {
-			printf("egtag portmap format error, should be of length 7\n");
+			printf
+			    ("egtag portmap format error, should be of length 7\n");
 			return;
 		}
 
 		for (i = 0; i < 8; i++) {
 			if (argv[8][i] < '0' || argv[8][i] > '3') {
-				printf("egtag portmap format error, should be of combination of 0 or 3\n");
+				printf
+				    ("egtag portmap format error, should be of combination of 0 or 3\n");
 				return;
 			}
 			//eg_tag += (argv[8][i] - '0') * (1 << i * 2);
 			eg_tag |= (argv[8][i] - '0') << (i * 2);
 		}
 
-		value |= (1 << 28);    //eg tag control enable
+		value |= (1 << 28);	//eg tag control enable
 		value2 &= ~(0xffff);
 		value2 |= eg_tag;
 	}
@@ -2028,14 +2139,14 @@
 	reg_write(REG_VAWD2_ADDR, value2);
 	//printf("VAWD1=0x%08x VAWD2=0x%08x ", value, value2);
 
-	value = (0x80001000 + vid); //w_vid_cmd
+	value = (0x80001000 + vid);	//w_vid_cmd
 	reg_write(REG_VTCR_ADDR, value);
 	//printf("VTCR=0x%08x\n", value);
 
 	for (i = 0; i < 300; i++) {
 		usleep(1000);
 		reg_read(REG_VTCR_ADDR, &value);
-		if ((value & 0x80000000) == 0) //table busy
+		if ((value & 0x80000000) == 0)	//table busy
 			break;
 	}
 
@@ -2047,7 +2158,7 @@
 {
 	unsigned int leaky_en = 0;
 	unsigned int wan_num = 4;
-	unsigned int port, offset, value;
+	unsigned int port = 0, offset = 0, value = 0;
 	char cmd[80];
 	int ret;
 
@@ -2074,8 +2185,7 @@
 			reg_write(0x2410, value & (~(1 << 3)));
 			reg_write(REG_ISC_ADDR, 0x01027d01);
 		}
-	}
-	else
+	} else
 		reg_write(REG_ISC_ADDR, 0x10027d60);
 
 	reg_write(0x1c, 0x08100810);
@@ -2086,15 +2196,15 @@
 	reg_write(0x2408, 0xb3ff);
 	reg_write(0x2608, 0xb3ff);
 	/* Enable Port ACL
-	* reg_write(0x2P04, 0xff0403);
-	*/
+	 * reg_write(0x2P04, 0xff0403);
+	 */
 	for (port = 0; port <= 6; port++) {
 		offset = 0x2004 + port * 0x100;
 		reg_read(offset, &value);
 		reg_write(offset, value | (1 << 10));
 	}
 
-	/*IGMP query only p4 -> p5*/
+	/*IGMP query only p4 -> p5 */
 	reg_write(0x94, 0x00ff0002);
 	if (wan_num == 4)
 		reg_write(0x98, 0x000a1008);
@@ -2114,7 +2224,7 @@
 	reg_write(0x98, 0x0);
 	reg_write(0x90, 0x8000b000);
 
-	/*IGMP p5 -> p4*/
+	/*IGMP p5 -> p4 */
 	reg_write(0x94, 0x00ff0002);
 	reg_write(0x98, 0x000a2008);
 	reg_write(0x90, 0x80005002);
@@ -2128,7 +2238,7 @@
 	reg_write(0x98, 0x0);
 	reg_write(0x90, 0x8000b001);
 
-	/*IGMP p0~p3 -> p6*/
+	/*IGMP p0~p3 -> p6 */
 	reg_write(0x94, 0x00ff0002);
 	if (wan_num == 4)
 		reg_write(0x98, 0x000a0f08);
@@ -2142,7 +2252,7 @@
 	reg_write(0x98, 0x0);
 	reg_write(0x90, 0x8000b002);
 
-	/*IGMP query only p6 -> p0~p3*/
+	/*IGMP query only p6 -> p0~p3 */
 	reg_write(0x94, 0x00ff0002);
 	reg_write(0x98, 0x000a4008);
 	reg_write(0x90, 0x80005004);
@@ -2159,18 +2269,21 @@
 	reg_write(0x98, 0x0);
 	reg_write(0x90, 0x8000b003);
 
-	/*Force eth2 to receive all igmp packets*/
-	snprintf(cmd, sizeof(cmd), "echo 2 > /sys/devices/virtual/net/%s/brif/%s/multicast_router", BR_DEVNAME, ETH_DEVNAME);
+	/*Force eth2 to receive all igmp packets */
+	snprintf(cmd, sizeof(cmd),
+		 "echo 2 > /sys/devices/virtual/net/%s/brif/%s/multicast_router",
+		 BR_DEVNAME, ETH_DEVNAME);
 	ret = system(cmd);
 	if (ret)
-		printf("Failed to set /sys/devices/virtual/net/%s/brif/%s/multicast_router\n",
-		       BR_DEVNAME, ETH_DEVNAME);
+		printf
+		    ("Failed to set /sys/devices/virtual/net/%s/brif/%s/multicast_router\n",
+		     BR_DEVNAME, ETH_DEVNAME);
 }
 
 void igmp_disable(int argc, char *argv[])
 {
-	unsigned int reg_offset, value;
-	int port_num;
+	unsigned int reg_offset = 0, value = 0;
+	int port_num = 0;
 
 	if (argc < 4) {
 		printf("insufficient arguments!\n");
@@ -2181,7 +2294,6 @@
 		printf("wrong port range, should be within 0~6\n");
 		return;
 	}
-
 	//set ISC: IGMP Snooping Control Register (offset: 0x0018)
 	reg_offset = 0x2008;
 	reg_offset |= (port_num << 8);
@@ -2192,7 +2304,7 @@
 
 void igmp_enable(int argc, char *argv[])
 {
-	unsigned int reg_offset, value;
+	unsigned int reg_offset = 0, value = 0;
 	int port_num;
 
 	if (argc < 4) {
@@ -2204,7 +2316,6 @@
 		printf("wrong port range, should be within 0~6\n");
 		return;
 	}
-
 	//set ISC: IGMP Snooping Control Register (offset: 0x0018)
 	reg_offset = 0x2008;
 	reg_offset |= (port_num << 8);
@@ -2212,15 +2323,15 @@
 	reg_write(reg_offset, value);
 }
 
-void igmp_off()
+void igmp_off(int argc, char *argv[])
 {
-	unsigned int value;
+	unsigned int value = 0;
 	//set ISC: IGMP Snooping Control Register (offset: 0x0018)
 	reg_read(REG_ISC_ADDR, &value);
-	value &= ~(1 << 18); //disable
+	value &= ~(1 << 18);	//disable
 	reg_write(REG_ISC_ADDR, value);
 
-	/*restore wan port multicast leaky vlan function: default disabled*/
+	/*restore wan port multicast leaky vlan function: default disabled */
 	reg_read(0x2010, &value);
 	reg_write(0x2010, value & (~(1 << 3)));
 	reg_read(0x2410, &value);
@@ -2229,10 +2340,10 @@
 	printf("config igmpsnoop off.\n");
 }
 
-int switch_reset(int argc, char *argv[])
+void switch_reset(int argc, char *argv[])
 {
 	if (chip_name == 0x7988)
-		return -1;
+		return;
 
 	unsigned int value = 0;
 	/*Software Register Reset  and Software System Reset */
@@ -2245,23 +2356,24 @@
 		printf("GPIO Mode (0x7c0c) select value =0x%x  \n", value);
 	}
 	printf("Switch Software Reset !!! \n");
-	return 0;
 }
 
-int phy_set_fc(int argc, char *argv[])
+void phy_set_fc(int argc, char *argv[])
 {
-	unsigned int port, pause_capable;
-	unsigned int phy_value;
+	unsigned int port = 0, pause_capable = 0;
+	unsigned int phy_value = 0;
 
 	port = atoi(argv[3]);
 	pause_capable = atoi(argv[4]);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if (port > MAX_PORT - 2 || pause_capable > 1) {
-		printf("Illegal parameter (port:0~4, full_duplex_pause_capable:0|1)\n");
-		return -1;
+		printf
+		    ("Illegal parameter (port:0~4, full_duplex_pause_capable:0|1)\n");
+		return;
 	}
 	printf("port=%d, full_duplex_pause_capable:%d\n", port, pause_capable);
+
 	mii_mgr_read(port, 4, &phy_value);
 	printf("read phy_value:0x%x\r\n", phy_value);
 	phy_value &= (~(0x1 << 10));
@@ -2272,35 +2384,36 @@
 	}
 	mii_mgr_write(port, 4, phy_value);
 	printf("write phy_value:0x%x\r\n", phy_value);
-	return 0;
-} /*end phy_set_fc*/
+	return;
+}				/*end phy_set_fc */
 
-int phy_set_an(int argc, char *argv[])
+void phy_set_an(int argc, char *argv[])
 {
-	unsigned int port, auto_negotiation_en;
-	unsigned int phy_value;
+	unsigned int port = 0, auto_negotiation_en = 0;
+	unsigned int phy_value = 0;
 
 	port = atoi(argv[3]);
 	auto_negotiation_en = atoi(argv[4]);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if (port > MAX_PORT - 2 || auto_negotiation_en > 1) {
-		printf("Illegal parameter (port:0~4, auto_negotiation_en:0|1)\n");
-		return -1;
+		printf
+		    ("Illegal parameter (port:0~4, auto_negotiation_en:0|1)\n");
+		return;
 	}
 	printf("port=%d, auto_negotiation_en:%d\n", port, auto_negotiation_en);
+
 	mii_mgr_read(port, 0, &phy_value);
 	printf("read phy_value:0x%x\r\n", phy_value);
 	phy_value &= (~(1 << 12));
 	phy_value |= (auto_negotiation_en << 12);
 	mii_mgr_write(port, 0, phy_value);
 	printf("write phy_value:0x%x\r\n", phy_value);
-	return 0;
-} /*end phy_set_an*/
+}				/*end phy_set_an */
 
-int set_mac_pfc(int argc, char *argv[])
+void set_mac_pfc(int argc, char *argv[])
 {
-	unsigned int value;
+	unsigned int value = 0;
 	int port, enable = 0;
 
 	port = atoi(argv[3]);
@@ -2308,7 +2421,7 @@
 	printf("enable: %d\n", enable);
 	if (port < 0 || port > 6 || enable < 0 || enable > 1) {
 		printf("Illegal parameter (port:0~6, enable|diable:0|1) \n");
-		return -1;
+		return;
 	}
 	if (chip_name == 0x7531 || chip_name == 0x7988) {
 		reg_read(REG_PFC_CTRL_ADDR, &value);
@@ -2316,25 +2429,23 @@
 		value |= (enable << port);
 		printf("write reg: %x, value: %x\n", REG_PFC_CTRL_ADDR, value);
 		reg_write(REG_PFC_CTRL_ADDR, value);
-	}
-	else
+	} else
 		printf("\nCommand not support by this chip.\n");
-	return 0;
 }
 
-int global_set_mac_fc(int argc, char *argv[])
+void global_set_mac_fc(int argc, char *argv[])
 {
 	unsigned char enable = 0;
-	unsigned int value, reg;
+	unsigned int value = 0, reg = 0;
 
 	if (chip_name == 0x7530) {
 		enable = atoi(argv[3]);
 		printf("enable: %d\n", enable);
 
-		/*Check the input parameters is right or not.*/
+		/*Check the input parameters is right or not. */
 		if (enable > 1) {
 			printf(HELP_MACCTL_FC);
-			return -1;
+			return;
 		}
 		reg_write(0x7000, 0x3);
 		reg = REG_GFCCR0_ADDR;
@@ -2345,17 +2456,16 @@
 		reg_write(REG_GFCCR0_ADDR, value);
 	} else
 		printf("\r\nCommand not support by this chip.\n");
-	return 0;
-} /*end mac_set_fc*/
+}				/*end mac_set_fc */
 
-int qos_sch_select(int argc, char *argv[])
+void qos_sch_select(int argc, char *argv[])
 {
-	unsigned char port, queue;
+	unsigned char port = 0, queue = 0;
 	unsigned char type = 0;
-	unsigned int value, reg;
+	unsigned int value = 0, reg = 0;
 
 	if (argc < 7)
-		return -1;
+		return;
 
 	port = atoi(argv[3]);
 	queue = atoi(argv[4]);
@@ -2363,26 +2473,26 @@
 
 	if (port > 6 || queue > 7) {
 		printf("\n Illegal input parameters\n");
-		return -1;
+		return;
 	}
 
 	if ((type != 0 && type != 1 && type != 2)) {
 		printf(HELP_QOS_TYPE);
-		return -1;
+		return;
 	}
 
-	printf("\r\nswitch qos type: %d.\n",type);
+	printf("\r\nswitch qos type: %d.\n", type);
 
 	if (!strncmp(argv[5], "min", 4)) {
 
 		if (type == 0) {
-			/*min sharper-->round roubin, disable min sharper rate limit*/
+			/*min sharper-->round roubin, disable min sharper rate limit */
 			reg = GSW_MMSCR0_Q(queue) + 0x100 * port;
 			reg_read(reg, &value);
 			value = 0x0;
 			reg_write(reg, value);
 		} else if (type == 1) {
-			/*min sharper-->sp, disable min sharper rate limit*/
+			/*min sharper-->sp, disable min sharper rate limit */
 			reg = GSW_MMSCR0_Q(queue) + 0x100 * port;
 			reg_read(reg, &value);
 			value = 0x0;
@@ -2390,75 +2500,72 @@
 			reg_write(reg, value);
 		} else {
 			printf("min sharper only support: rr or sp\n");
-			return -1;
+			return;
 		}
 	} else if (!strncmp(argv[5], "max", 4)) {
 		if (type == 1) {
-			/*max sharper-->sp, disable max sharper rate limit*/
+			/*max sharper-->sp, disable max sharper rate limit */
 			reg = GSW_MMSCR1_Q(queue) + 0x100 * port;
 			reg_read(reg, &value);
 			value = 0x0;
 			value |= (1 << 31);
 			reg_write(reg, value);
 		} else if (type == 2) {
-			/*max sharper-->wfq, disable max sharper rate limit*/
+			/*max sharper-->wfq, disable max sharper rate limit */
 			reg = GSW_MMSCR1_Q(queue) + 0x100 * port;
 			reg_read(reg, &value);
 			value = 0x0;
 			reg_write(reg, value);
 		} else {
 			printf("max sharper only support: wfq or sp\n");
-			return -1;
+			return;
 		}
 	} else {
-		printf("\r\nIllegal sharper:%s\n",argv[5]);
-		return -1;
+		printf("\r\nIllegal sharper:%s\n", argv[5]);
+		return;
 	}
-	printf("reg:0x%x--value:0x%x\n",reg,value);
-
-	return 0;
+	printf("reg:0x%x--value:0x%x\n", reg, value);
 }
 
 void get_upw(unsigned int *value, unsigned char base)
 {
 	*value &= (~((0x7 << 0) | (0x7 << 4) | (0x7 << 8) | (0x7 << 12) |
 		     (0x7 << 16) | (0x7 << 20)));
-	switch (base)
-	{
-		case 0: /* port-based 0x2x40[18:16] */
-			*value |= ((0x2 << 0) | (0x2 << 4) | (0x2 << 8) |
-				(0x2 << 12) | (0x7 << 16) | (0x2 << 20));
-			break;
-		case 1: /* tagged-based 0x2x40[10:8] */
-			*value |= ((0x2 << 0) | (0x2 << 4) | (0x7 << 8) |
-				(0x2 << 12) | (0x2 << 16) | (0x2 << 20));
-			break;
-		case 2: /* DSCP-based 0x2x40[14:12] */
-			*value |= ((0x2 << 0) | (0x2 << 4) | (0x2 << 8) |
-				(0x7 << 12) | (0x2 << 16) | (0x2 << 20));
-			break;
-		case 3: /* acl-based 0x2x40[2:0] */
-			*value |= ((0x7 << 0) | (0x2 << 4) | (0x2 << 8) |
-				(0x2 << 12) | (0x2 << 16) | (0x2 << 20));
-			break;
-		case 4: /* arl-based 0x2x40[22:20] */
-			*value |= ((0x2 << 0) | (0x2 << 4) | (0x2 << 8) |
-				(0x2 << 12) | (0x2 << 16) | (0x7 << 20));
-			break;
-		case 5: /* stag-based 0x2x40[6:4] */
-			*value |= ((0x2 << 0) | (0x7 << 4) | (0x2 << 8) |
-				(0x2 << 12) | (0x2 << 16) | (0x2 << 20));
-			break;
-		default:
-			break;
+	switch (base) {
+	case 0:		/* port-based 0x2x40[18:16] */
+		*value |= ((0x2 << 0) | (0x2 << 4) | (0x2 << 8) |
+			   (0x2 << 12) | (0x7 << 16) | (0x2 << 20));
+		break;
+	case 1:		/* tagged-based 0x2x40[10:8] */
+		*value |= ((0x2 << 0) | (0x2 << 4) | (0x7 << 8) |
+			   (0x2 << 12) | (0x2 << 16) | (0x2 << 20));
+		break;
+	case 2:		/* DSCP-based 0x2x40[14:12] */
+		*value |= ((0x2 << 0) | (0x2 << 4) | (0x2 << 8) |
+			   (0x7 << 12) | (0x2 << 16) | (0x2 << 20));
+		break;
+	case 3:		/* acl-based 0x2x40[2:0] */
+		*value |= ((0x7 << 0) | (0x2 << 4) | (0x2 << 8) |
+			   (0x2 << 12) | (0x2 << 16) | (0x2 << 20));
+		break;
+	case 4:		/* arl-based 0x2x40[22:20] */
+		*value |= ((0x2 << 0) | (0x2 << 4) | (0x2 << 8) |
+			   (0x2 << 12) | (0x2 << 16) | (0x7 << 20));
+		break;
+	case 5:		/* stag-based 0x2x40[6:4] */
+		*value |= ((0x2 << 0) | (0x7 << 4) | (0x2 << 8) |
+			   (0x2 << 12) | (0x2 << 16) | (0x2 << 20));
+		break;
+	default:
+		break;
 	}
 }
 
 void qos_set_base(int argc, char *argv[])
 {
 	unsigned char base = 0;
-	unsigned char port;
-	unsigned int value;
+	unsigned char port = 0;
+	unsigned int value = 0;
 
 	if (argc < 5)
 		return;
@@ -2472,13 +2579,12 @@
 	}
 
 	if (port > 6) {
-		printf("Illegal port index:%d\n",port);
+		printf("Illegal port index:%d\n", port);
 		return;
 	}
 
 	printf("\r\nswitch qos base : %d. (port-based:0, tag-based:1,\
-		dscp-based:2, acl-based:3, arl-based:4, stag-based:5)\n",
-	       base);
+		dscp-based:2, acl-based:3, arl-based:4, stag-based:5)\n", base);
 	if (chip_name == 0x7530) {
 
 		reg_read(0x44, &value);
@@ -2491,7 +2597,7 @@
 		reg_read(GSW_UPW(port), &value);
 		get_upw(&value, base);
 		reg_write(GSW_UPW(port), value);
-		printf("reg:0x%x, value: 0x%x\n",GSW_UPW(port),value);
+		printf("reg:0x%x, value: 0x%x\n", GSW_UPW(port), value);
 
 	} else {
 		printf("unknown switch device");
@@ -2501,9 +2607,9 @@
 
 void qos_wfq_set_weight(int argc, char *argv[])
 {
-	int port, weight[8], i;
-	unsigned char queue;
-	unsigned int reg, value;
+	int port = 0, weight[8], i = 0;
+	unsigned char queue = 0;
+	unsigned int reg = 0, value = 0;
 
 	port = atoi(argv[3]);
 
@@ -2524,14 +2630,12 @@
 		}
 	}
 	printf("port: %x, q0: %x, q1: %x, q2: %x, q3: %x, \
-		q4: %x, q5: %x, q6: %x, q7: %x\n",
-	       port, weight[0], weight[1], weight[2], weight[3], weight[4],
-	       weight[5], weight[6], weight[7]);
+		q4: %x, q5: %x, q6: %x, q7: %x\n", port, weight[0], weight[1], weight[2], weight[3], weight[4], weight[5], weight[6], weight[7]);
 
 	for (queue = 0; queue < 8; queue++) {
 		reg = GSW_MMSCR1_Q(queue) + 0x100 * port;
 		reg_read(reg, &value);
-		value &= (~(0xf << 24)); //bit24~27
+		value &= (~(0xf << 24));	//bit24~27
 		value |= (((weight[queue] - 1) & 0xf) << 24);
 		printf("reg: %x, value: %x\n", reg, value);
 		reg_write(reg, value);
@@ -2540,8 +2644,8 @@
 
 void qos_set_portpri(int argc, char *argv[])
 {
-	unsigned char port, prio;
-	unsigned int value;
+	unsigned char port = 0, prio = 0;
+	unsigned int value = 0;
 
 	port = atoi(argv[3]);
 	prio = atoi(argv[4]);
@@ -2560,8 +2664,8 @@
 
 void qos_set_dscppri(int argc, char *argv[])
 {
-	unsigned char prio, dscp, pim_n, pim_offset;
-	unsigned int reg, value;
+	unsigned char prio = 0, dscp = 0, pim_n = 0, pim_offset = 0;
+	unsigned int value = 0, reg = 0;
 
 	dscp = atoi(argv[3]);
 	prio = atoi(argv[4]);
@@ -2583,8 +2687,8 @@
 
 void qos_pri_mapping_queue(int argc, char *argv[])
 {
-	unsigned char prio, queue, pem_n, port;
-	unsigned int reg, value;
+	unsigned char prio = 0, queue = 0, pem_n = 0, port = 0;
+	unsigned int value = 0, reg = 0;
 
 	if (argc < 6)
 		return;
@@ -2597,6 +2701,7 @@
 		printf(HELP_QOS_PRIO_QMAP);
 		return;
 	}
+
 	if (chip_name == 0x7530) {
 		pem_n = prio / 2;
 		reg = pem_n * 0x4 + 0x48;
@@ -2614,34 +2719,33 @@
 		pem_n = prio / 2;
 		reg = GSW_PEM(pem_n) + 0x100 * port;
 		reg_read(reg, &value);
-		if (prio % 2) { // 1 1
+		if (prio % 2) {	// 1 1
 			value &= (~(0x7 << 25));
 			value |= ((queue & 0x7) << 25);
-		} else { // 0 0
+		} else {	// 0 0
 			value &= (~(0x7 << 9));
 			value |= ((queue & 0x7) << 9);
 		}
 		reg_write(reg, value);
 		printf("write reg: %x, value: %x\n", reg, value);
-	}
-	else {
+	} else {
 		printf("unknown switch device");
 		return;
 	}
 }
 
 static int macMT753xVlanSetVid(unsigned char index, unsigned char active,
-			       unsigned short vid, unsigned char portMap, unsigned char tagPortMap,
-			       unsigned char ivl_en, unsigned char fid, unsigned short stag)
+			       unsigned short vid, unsigned char portMap,
+			       unsigned char tagPortMap, unsigned char ivl_en,
+			       unsigned char fid, unsigned short stag)
 {
 	unsigned int value = 0;
 	unsigned int value2 = 0;
-	unsigned int reg;
-	int i;
+	unsigned int reg = 0;
+	int i = 0;
 
 	printf("index: %x, active: %x, vid: %x, portMap: %x, \
-		tagPortMap: %x, ivl_en: %x, fid: %x, stag: %x\n",
-	       index, active, vid, portMap, tagPortMap, ivl_en, fid, stag);
+		tagPortMap: %x, ivl_en: %x, fid: %x, stag: %x\n", index, active, vid, portMap, tagPortMap, ivl_en, fid, stag);
 
 	value = (portMap << 16);
 	value |= (stag << 4);
@@ -2656,22 +2760,22 @@
 	}
 
 	if (value2)
-		value |= (1 << 28); // eg_tag
+		value |= (1 << 28);	// eg_tag
 
-	reg = 0x98; // VAWD2
+	reg = 0x98;		// VAWD2
 	reg_write(reg, value2);
 
-	reg = 0x94; // VAWD1
+	reg = 0x94;		// VAWD1
 	reg_write(reg, value);
 
-	reg = 0x90; // VTCR
+	reg = 0x90;		// VTCR
 	value = (0x80001000 + vid);
 	reg_write(reg, value);
 
-	reg = 0x90; // VTCR
+	reg = 0x90;		// VTCR
 	while (1) {
 		reg_read(reg, &value);
-		if ((value & 0x80000000) == 0) //table busy
+		if ((value & 0x80000000) == 0)	//table busy
 			break;
 	}
 
@@ -2685,45 +2789,14 @@
 	       index, active, vid, portMap, tagPortMap);
 	return 0;
 
-} /*end macMT753xVlanSetVid*/
-/*
-static int macMT753xVlanGetVtbl(unsigned short index)
-{
-	unsigned int reg, value, vawd1, vawd2;
-
-	reg = 0x90; // VTCR
-	value = (0x80000000 + index);
-
-	reg_write(reg, value);
-
-	reg = 0x90; // VTCR
-	while (1) {
-		reg_read(reg, &value);
-		if ((value & 0x80000000) == 0) //table busy
-			break;
-	}
-
-	reg = 0x94; // VAWD1
-	reg_read(reg, &vawd1);
-
-	reg = 0x98; // VAWD2
-	reg_read(reg, &vawd2);
-
-	if (vawd1 & 0x1) {
-		fprintf(stderr, "%d.%s vid:%d fid:%d portMap:0x%x \
-				tagMap:0x%x stag:0x%x ivl_en:0x%x\r\n",
-			index, (vawd1 & 0x1) ? "on" : "off", index, ((vawd1 & 0xe) >> 1),
-			(vawd1 & 0xff0000) >> 16, vawd2, (vawd1 & 0xfff0) >> 0x4, (vawd1 >> 30) & 0x1);
-	}
-	return 0;
-} */ /*end macMT753xVlanGetVtbl*/
+}				/*end macMT753xVlanSetVid */
 
 static int macMT753xVlanSetPvid(unsigned char port, unsigned short pvid)
 {
-	unsigned int value;
-	unsigned int reg;
+	unsigned int value = 0;
+	unsigned int reg = 0;
 
-	/*Parameters is error*/
+	/*Parameters is error */
 	if (port > 6)
 		return -1;
 
@@ -2742,38 +2815,6 @@
 	printf("SetPVID: port:%d pvid:%d\r\n", port, pvid);
 	return 0;
 }
-/*
-static int macMT753xVlanGetPvid(unsigned char port)
-{
-	unsigned int value;
-	unsigned int reg;
-
-	if (port > 6)
-		return -1;
-	reg = 0x2014 + (port * 0x100);
-	reg_read(reg, &value);
-	return (value & 0xfff);
-} */
-/*
-static int macMT753xVlanDisp(void)
-{
-	unsigned int i = 0;
-	unsigned int reg, value;
-
-	reg = 0x2604;
-	reg_read(reg, &value);
-	value &= 0x30000000;
-
-	fprintf(stderr, "VLAN function is %s\n", value ? ETHCMD_ENABLE : ETHCMD_DISABLE);
-	fprintf(stderr, "PVID e0:%02d e1:%02d e2:%02d e3:%02d e4:%02d e5:%02d e6:%02d\n",
-		macMT753xVlanGetPvid(0), macMT753xVlanGetPvid(1), macMT753xVlanGetPvid(2),
-		macMT753xVlanGetPvid(3), macMT753xVlanGetPvid(4), macMT753xVlanGetPvid(5), macMT753xVlanGetPvid(6));
-
-	for (i = 0; i < MAX_VID_VALUE; i++)
-		macMT753xVlanGetVtbl(i);
-
-	return 0;
-}*/ /*end macMT753xVlanDisp*/
 
 void doVlanSetPvid(int argc, char *argv[])
 {
@@ -2782,7 +2823,7 @@
 
 	port = atoi(argv[3]);
 	pvid = atoi(argv[4]);
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if ((port >= SWITCH_MAX_PORT) || (pvid > MAX_VID_VALUE)) {
 		printf(HELP_VLAN_PVID);
 		return;
@@ -2792,7 +2833,7 @@
 
 	printf("port:%d pvid:%d,vlancap: max_port:%d maxvid:%d\r\n",
 	       port, pvid, SWITCH_MAX_PORT, MAX_VID_VALUE);
-} /*end doVlanSetPvid*/
+}				/*end doVlanSetPvid */
 
 void doVlanSetVid(int argc, char *argv[])
 {
@@ -2810,13 +2851,13 @@
 	active = atoi(argv[4]);
 	vid = atoi(argv[5]);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if ((index >= MAX_VLAN_RULE) || (vid >= 4096) || (active > ACTIVED)) {
 		printf(HELP_VLAN_VID);
 		return;
 	}
 
-	/*CPU Port is always the membership*/
+	/*CPU Port is always the membership */
 	portMap = atoi(argv[6]);
 	tagPortMap = atoi(argv[7]);
 
@@ -2832,21 +2873,21 @@
 	macMT753xVlanSetVid(index, active, vid, portMap, tagPortMap,
 			    ivl_en, fid, stag);
 	printf("index:%d active:%d vid:%d\r\n", index, active, vid);
-} /*end doVlanSetVid*/
+}				/*end doVlanSetVid */
 
 void doVlanSetAccFrm(int argc, char *argv[])
 {
 	unsigned char port = 0;
 	unsigned char type = 0;
-	unsigned int value;
-	unsigned int reg;
+	unsigned int value = 0;
+	unsigned int reg = 0;
 
 	port = atoi(argv[3]);
 	type = atoi(argv[4]);
 
 	printf("port: %d, type: %d\n", port, type);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if ((port > SWITCH_MAX_PORT) || (type > REG_PVC_ACC_FRM_RELMASK)) {
 		printf(HELP_VLAN_ACC_FRM);
 		return;
@@ -2859,21 +2900,21 @@
 
 	printf("write reg: %x, value: %x\n", reg, value);
 	reg_write(reg, value);
-} /*end doVlanSetAccFrm*/
+}				/*end doVlanSetAccFrm */
 
 void doVlanSetPortAttr(int argc, char *argv[])
 {
 	unsigned char port = 0;
 	unsigned char attr = 0;
-	unsigned int value;
-	unsigned int reg;
+	unsigned int value = 0;
+	unsigned int reg = 0;
 
 	port = atoi(argv[3]);
 	attr = atoi(argv[4]);
 
 	printf("port: %x, attr: %x\n", port, attr);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if (port > SWITCH_MAX_PORT || attr > 3) {
 		printf(HELP_VLAN_PORT_ATTR);
 		return;
@@ -2892,13 +2933,14 @@
 {
 	unsigned char port = 0;
 	unsigned char mode = 0;
-	unsigned int value;
-	unsigned int reg;
+	unsigned int value = 0;
+	unsigned int reg = 0;
+
 	port = atoi(argv[3]);
 	mode = atoi(argv[4]);
 	printf("port: %x, mode: %x\n", port, mode);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if (port > SWITCH_MAX_PORT || mode > 3) {
 		printf(HELP_VLAN_PORT_MODE);
 		return;
@@ -2916,15 +2958,15 @@
 {
 	unsigned char port = 0;
 	unsigned char eg_tag = 0;
-	unsigned int value;
-	unsigned int reg;
+	unsigned int value = 0;
+	unsigned int reg = 0;
 
 	port = atoi(argv[3]);
 	eg_tag = atoi(argv[4]);
 
 	printf("port: %d, eg_tag: %d\n", port, eg_tag);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if ((port > SWITCH_MAX_PORT) || (eg_tag > REG_PCR_EG_TAG_RELMASK)) {
 		printf(HELP_VLAN_EGRESS_TAG_PCR);
 		return;
@@ -2938,21 +2980,21 @@
 	printf("write reg: %x, value: %x\n", reg, value);
 	reg_write(reg, value);
 
-} /*end doVlanSetEgressTagPCR*/
+}				/*end doVlanSetEgressTagPCR */
 
 void doVlanSetEgressTagPVC(int argc, char *argv[])
 {
 	unsigned char port = 0;
 	unsigned char eg_tag = 0;
-	unsigned int value;
-	unsigned int reg;
+	unsigned int value = 0;
+	unsigned int reg = 0;
 
 	port = atoi(argv[3]);
 	eg_tag = atoi(argv[4]);
 
 	printf("port: %d, eg_tag: %d\n", port, eg_tag);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if ((port > SWITCH_MAX_PORT) || (eg_tag > REG_PVC_EG_TAG_RELMASK)) {
 		printf(HELP_VLAN_EGRESS_TAG_PVC);
 		return;
@@ -2965,19 +3007,19 @@
 
 	printf("write reg: %x, value: %x\n", reg, value);
 	reg_write(reg, value);
-} /*end doVlanSetEgressTagPVC*/
+}				/*end doVlanSetEgressTagPVC */
 
 void doArlAging(int argc, char *argv[])
 {
 	unsigned char aging_en = 0;
-	unsigned int time = 0, aging_cnt = 0, aging_unit = 0, value, reg;
-	;
+	unsigned int time = 0, aging_cnt = 0, aging_unit = 0, value = 0, reg =
+	    0;
 
 	aging_en = atoi(argv[3]);
 	time = atoi(argv[4]);
 	printf("aging_en: %x, aging time: %x\n", aging_en, time);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if ((aging_en != 0 && aging_en != 1) || (time <= 0 || time > 65536)) {
 		printf(HELP_ARL_AGING);
 		return;
@@ -3006,16 +3048,16 @@
 
 void doMirrorEn(int argc, char *argv[])
 {
-	unsigned char mirror_en;
-	unsigned char mirror_port;
-	unsigned int value, reg;
+	unsigned char mirror_en = 0;
+	unsigned char mirror_port = 0;
+	unsigned int value = 0, reg = 0;
 
 	mirror_en = atoi(argv[3]);
 	mirror_port = atoi(argv[4]);
 
 	printf("mirror_en: %d, mirror_port: %d\n", mirror_en, mirror_port);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if ((mirror_en > 1) || (mirror_port > REG_CFC_MIRROR_PORT_RELMASK)) {
 		printf(HELP_MIRROR_EN);
 		return;
@@ -3031,12 +3073,13 @@
 	printf("write reg: %x, value: %x\n", reg, value);
 	reg_write(reg, value);
 
-} /*end doMirrorEn*/
+}				/*end doMirrorEn */
 
 void doMirrorPortBased(int argc, char *argv[])
 {
-	unsigned char port, port_tx_mir, port_rx_mir, vlan_mis, acl_mir, igmp_mir;
-	unsigned int value, reg;
+	unsigned char port = 0, port_tx_mir = 0, port_rx_mir = 0, vlan_mis =
+	    0, acl_mir = 0, igmp_mir = 0;
+	unsigned int value = 0, reg = 0;
 
 	port = atoi(argv[3]);
 	port_tx_mir = atoi(argv[4]);
@@ -3045,20 +3088,28 @@
 	vlan_mis = atoi(argv[7]);
 	igmp_mir = atoi(argv[8]);
 
-	printf("port:%d, port_tx_mir:%d, port_rx_mir:%d, acl_mir:%d, vlan_mis:%d, igmp_mir:%d\n", port, port_tx_mir, port_rx_mir, acl_mir, vlan_mis, igmp_mir);
+	printf
+	    ("port:%d, port_tx_mir:%d, port_rx_mir:%d, acl_mir:%d, vlan_mis:%d, igmp_mir:%d\n",
+	     port, port_tx_mir, port_rx_mir, acl_mir, vlan_mis, igmp_mir);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	//if((port >= vlanCap->max_port_no) || (port_tx_mir > 1) || (port_rx_mir > 1) || (acl_mir > 1) || (vlan_mis > 1)){
-	if ((port >= 7) || (port_tx_mir > 1) || (port_rx_mir > 1) || (acl_mir > 1) || (vlan_mis > 1)) { // also allow CPU port (port6)
+	if ((port >= 7) || (port_tx_mir > 1) || (port_rx_mir > 1) || (acl_mir > 1) || (vlan_mis > 1)) {	// also allow CPU port (port6)
 		printf(HELP_MIRROR_PORTBASED);
 		return;
 	}
 
 	reg = REG_PCR_P0_ADDR + port * 0x100;
 	reg_read(reg, &value);
-	value &= ~(REG_PORT_TX_MIR_MASK | REG_PORT_RX_MIR_MASK | REG_PCR_ACL_MIR_MASK | REG_PCR_VLAN_MIS_MASK);
-	value |= (port_tx_mir << REG_PORT_TX_MIR_OFFT) + (port_rx_mir << REG_PORT_RX_MIR_OFFT);
-	value |= (acl_mir << REG_PCR_ACL_MIR_OFFT) + (vlan_mis << REG_PCR_VLAN_MIS_OFFT);
+	value &=
+	    ~(REG_PORT_TX_MIR_MASK | REG_PORT_RX_MIR_MASK | REG_PCR_ACL_MIR_MASK
+	      | REG_PCR_VLAN_MIS_MASK);
+	value |=
+	    (port_tx_mir << REG_PORT_TX_MIR_OFFT) +
+	    (port_rx_mir << REG_PORT_RX_MIR_OFFT);
+	value |=
+	    (acl_mir << REG_PCR_ACL_MIR_OFFT) +
+	    (vlan_mis << REG_PCR_VLAN_MIS_OFFT);
 
 	printf("write reg: %x, value: %x\n", reg, value);
 	reg_write(reg, value);
@@ -3071,15 +3122,15 @@
 	printf("write reg: %x, value: %x\n", reg, value);
 	reg_write(reg, value);
 
-} /*end doMirrorPortBased*/
+}				/*end doMirrorPortBased */
 
 void doStp(int argc, char *argv[])
 {
 	unsigned char port = 0;
 	unsigned char fid = 0;
 	unsigned char state = 0;
-	unsigned int value;
-	unsigned int reg;
+	unsigned int value = 0;
+	unsigned int reg = 0;
 
 	port = atoi(argv[2]);
 	fid = atoi(argv[3]);
@@ -3087,7 +3138,7 @@
 
 	printf("port: %d, fid: %d, state: %d\n", port, fid, state);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if ((port > MAX_PORT + 1) || (fid > 7) || (state > 3)) {
 		printf(HELP_STP);
 		return;
@@ -3102,45 +3153,54 @@
 	reg_write(reg, value);
 }
 
-int ingress_rate_set(int on_off, unsigned int port, unsigned int bw)
+void _ingress_rate_set(int on_off, int port, int bw)
 {
-	unsigned int reg, value;
+	unsigned int reg = 0, value = 0;
 
 	reg = 0x1800 + (0x100 * port);
 	value = 0;
-	/*token-bucket*/
+	/*token-bucket */
 	if (on_off == 1) {
 		if (chip_name == 0x7530) {
 			if (bw > 1000000) {
-				printf("\n**Charge rate(%d) is larger than line rate(1000000kbps)**\n",bw);
-				return -1;
+				printf
+				    ("\n**Charge rate(%d) is larger than line rate(1000000kbps)**\n",
+				     bw);
+				return;
 			}
-			value = ((bw / 32) << 16) + (1 << 15) + (7 << 8) + (1 << 7) + 0x0f;
+			value =
+			    ((bw / 32) << 16) + (1 << 15) + (7 << 8) +
+			    (1 << 7) + 0x0f;
 		} else if (chip_name == 0x7531 || chip_name == 0x7988) {
 			if ((chip_name == 0x7531) && (bw > 2500000)) {
-				printf("\n**Charge rate(%d) is larger than line rate(2500000kbps)**\n",bw);
-				return -1;
+				printf
+				    ("\n**Charge rate(%d) is larger than line rate(2500000kbps)**\n",
+				     bw);
+				return;
 			}
 
 			if ((chip_name == 0x7988) && (bw > 4000000)) {
-				printf("\n**Charge rate(%d) is larger than line rate(4000000kbps)**\n",bw);
-				return -1;
+				printf
+				    ("\n**Charge rate(%d) is larger than line rate(4000000kbps)**\n",
+				     bw);
+				return;
 			}
 
-			if (bw/32 >= 65536) //supoort 2.5G case
-				value = ((bw / 32) << 16) + (1 << 15) + (1 << 14) + (1 << 12) + (7 << 8) + 0xf;
+			if (bw / 32 >= 65536)	//supoort 2.5G case
+				value =
+				    ((bw / 32) << 16) + (1 << 15) + (1 << 14) +
+				    (1 << 12) + (7 << 8) + 0xf;
 			else
-				value = ((bw / 32) << 16) + (1 << 15) + (1 << 14) + (7 << 8) + 0xf;
-		}
-		else
+				value =
+				    ((bw / 32) << 16) + (1 << 15) + (1 << 14) +
+				    (7 << 8) + 0xf;
+		} else
 			printf("unknow chip\n");
 	}
-
 #if leaky_bucket
 	reg_read(reg, &value);
 	value &= 0xffff0000;
-	if (on_off == 1)
-	{
+	if (on_off == 1) {
 		value |= on_off << 15;
 		//7530 same as 7531
 		if (bw < 100) {
@@ -3166,39 +3226,71 @@
 	reg_read(reg, &value);
 	value = 0x110104;
 	reg_write(reg, value);
-	return 0;
+
+	if (on_off)
+		printf("switch port=%d, bw=%d\n", port, bw);
+	else
+		printf("switch port=%d ingress rate limit off\n", port);
 }
 
-int egress_rate_set(int on_off, int port, int bw)
+void ingress_rate_set(int argc, char *argv[])
 {
-	unsigned int reg, value;
+	int on_off = 0, port = 0, bw = 0;
+
+	port = strtoul(argv[3], NULL, 0);
+	if (argv[2][1] == 'n') {
+		bw = strtoul(argv[4], NULL, 0);
+		on_off = 1;
+	} else if (argv[2][1] == 'f') {
+		if (argc != 4)
+			return;
+		on_off = 0;
+	}
+
+	_ingress_rate_set(on_off, port, bw);
+}
+
+void _egress_rate_set(int on_off, int port, int bw)
+{
+	unsigned int value = 0, reg = 0;
 
 	reg = 0x1040 + (0x100 * port);
 	value = 0;
-	/*token-bucket*/
+	/*token-bucket */
 	if (on_off == 1) {
 		if (chip_name == 0x7530) {
 			if (bw < 0 || bw > 1000000) {
-				printf("\n**Charge rate(%d) is larger than line rate(1000000kbps)**\n",bw);
-				return -1;
+				printf
+				    ("\n**Charge rate(%d) is larger than line rate(1000000kbps)**\n",
+				     bw);
+				return;
 			}
-			value = ((bw / 32) << 16) + (1 << 15) + (7 << 8) + (1 << 7) + 0xf;
+			value =
+			    ((bw / 32) << 16) + (1 << 15) + (7 << 8) +
+			    (1 << 7) + 0xf;
 		} else if (chip_name == 0x7531 || chip_name == 0x7988) {
 			if ((chip_name == 0x7531) && (bw < 0 || bw > 2500000)) {
-				printf("\n**Charge rate(%d) is larger than line rate(2500000kbps)**\n",bw);
-				return -1;
+				printf
+				    ("\n**Charge rate(%d) is larger than line rate(2500000kbps)**\n",
+				     bw);
+				return;
 			}
 			if ((chip_name == 0x7988) && (bw < 0 || bw > 4000000)) {
-				printf("\n**Charge rate(%d) is larger than line rate(4000000kbps)**\n",bw);
-				return -1;
+				printf
+				    ("\n**Charge rate(%d) is larger than line rate(4000000kbps)**\n",
+				     bw);
+				return;
 			}
 
-			if (bw/32 >= 65536)	//support 2.5G cases
-				value = ((bw / 32) << 16) + (1 << 15) + (1 << 14) + (1 << 12) + (7 << 8) + 0xf;
+			if (bw / 32 >= 65536)	//support 2.5G cases
+				value =
+				    ((bw / 32) << 16) + (1 << 15) + (1 << 14) +
+				    (1 << 12) + (7 << 8) + 0xf;
 			else
-				value = ((bw / 32) << 16) + (1 << 15) + (1 << 14) + (7 << 8) + 0xf;
-		}
-		else
+				value =
+				    ((bw / 32) << 16) + (1 << 15) + (1 << 14) +
+				    (7 << 8) + 0xf;
+		} else
 			printf("unknow chip\n");
 	}
 	reg_write(reg, value);
@@ -3207,7 +3299,28 @@
 	value &= 0x18;
 	reg_write(reg, value);
 
-	return 0;
+	if (on_off)
+		printf("switch port=%d, bw=%d\n", port, bw);
+	else
+		printf("switch port=%d egress rate limit off\n", port);
+}
+
+void egress_rate_set(int argc, char *argv[])
+{
+	unsigned int value = 0, reg = 0;
+	int on_off = 0, port = 0, bw = 0;
+
+	port = strtoul(argv[3], NULL, 0);
+	if (argv[2][1] == 'n') {
+		bw = strtoul(argv[4], NULL, 0);
+		on_off = 1;
+	} else if (argv[2][1] == 'f') {
+		if (argc != 4)
+			return;
+		on_off = 0;
+	}
+
+	_egress_rate_set(on_off, port, bw);
 }
 
 void rate_control(int argc, char *argv[])
@@ -3223,34 +3336,33 @@
 	if (port > 6)
 		return;
 
-	if (dir == 1) //ingress
-		ingress_rate_set(1, port, rate);
-	else if (dir == 0) //egress
-		egress_rate_set(1, port, rate);
+	if (dir == 1)		//ingress
+		_ingress_rate_set(1, port, rate);
+	else if (dir == 0)	//egress
+		_egress_rate_set(1, port, rate);
 	else
 		return;
 }
 
-int collision_pool_enable(int argc, char *argv[])
+void collision_pool_enable(int argc, char *argv[])
 {
 
-	unsigned char enable;
-	unsigned int value, reg;
+	unsigned char enable = 0;
+	unsigned int value = 0, reg = 0;
 
 	enable = atoi(argv[3]);
 
-
 	printf("collision pool enable: %d \n", enable);
 
-	/*Check the input parameters is right or not.*/
+	/*Check the input parameters is right or not. */
 	if (enable > 1) {
 		printf(HELP_COLLISION_POOL_EN);
-		return -1;
+		return;
 	}
 
 	if (chip_name == 0x7531 || chip_name == 0x7988) {
 		reg = REG_CPGC_ADDR;
-		if(enable == 1) {
+		if (enable == 1) {
 			/* active reset */
 			reg_read(reg, &value);
 			value &= (~REG_CPCG_COL_RST_N_MASK);
@@ -3276,7 +3388,7 @@
 
 			reg_read(reg, &value);
 			printf("write reg: %x, value: %x\n", reg, value);
-		}else {
+		} else {
 
 			/* disable collision pool */
 			reg_read(reg, &value);
@@ -3303,70 +3415,67 @@
 			printf("write reg: %x, value: %x\n", reg, value);
 
 		}
-	}else{
+	} else {
 		printf("\nCommand not support by this chip.\n");
-}
-
- return 0;
+	}
 }
 
-void collision_pool_mac_dump()
+void collision_pool_mac_dump(int argc, char *argv[])
 {
-	unsigned int value, reg;
+	unsigned int value = 0, reg = 0;
 
 	if (chip_name == 0x7531 || chip_name == 0x7988) {
 		reg = REG_CPGC_ADDR;
 		reg_read(reg, &value);
-		if(value & REG_CPCG_COL_EN_MASK)
+		if (value & REG_CPCG_COL_EN_MASK)
 			table_dump_internal(COLLISION_TABLE);
 		else
-			printf("\ncollision pool is disabled, please enable it before use this command.\n");
-	}else {
+			printf
+			    ("\ncollision pool is disabled, please enable it before use this command.\n");
+	} else {
 		printf("\nCommand not support by this chip.\n");
 	}
 }
 
-void collision_pool_dip_dump()
+void collision_pool_dip_dump(int argc, char *argv[])
 {
-	unsigned int value, reg;
+	unsigned int value = 0, reg = 0;
 
 	if (chip_name == 0x7531 || chip_name == 0x7988) {
 		reg = REG_CPGC_ADDR;
 		reg_read(reg, &value);
-		if(value & REG_CPCG_COL_EN_MASK)
+		if (value & REG_CPCG_COL_EN_MASK)
 			dip_dump_internal(COLLISION_TABLE);
 		else
-			printf("\ncollision pool is disabled, please enable it before use this command.\n");
-		}else {
+			printf
+			    ("\ncollision pool is disabled, please enable it before use this command.\n");
+	} else {
 		printf("\nCommand not support by this chip.\n");
 	}
-
-
 }
 
-void collision_pool_sip_dump()
+void collision_pool_sip_dump(int argc, char *argv[])
 {
-	unsigned int value, reg;
+	unsigned int value = 0, reg = 0;
 
-	if (chip_name == 0x7531 ||  chip_name == 0x7988) {
+	if (chip_name == 0x7531 || chip_name == 0x7988) {
 		reg = REG_CPGC_ADDR;
 		reg_read(reg, &value);
-		if(value & REG_CPCG_COL_EN_MASK)
+		if (value & REG_CPCG_COL_EN_MASK)
 			sip_dump_internal(COLLISION_TABLE);
 		else
-			printf("\ncollision pool is disabled, please enable it before use this command.\n");
-	}else {
+			printf
+			    ("\ncollision pool is disabled, please enable it before use this command.\n");
+	} else {
 		printf("\nCommand not support by this chip.\n");
 	}
-
-
 }
 
 void pfc_get_rx_counter(int argc, char *argv[])
 {
-	int port;
-	unsigned int value, reg;
-	unsigned int user_pri;
+	int port = 0;
+	unsigned int value = 0, reg = 0;
+	unsigned int user_pri = 0;
 
 	port = strtoul(argv[3], NULL, 0);
 	if (port < 0 || 6 < port) {
@@ -3374,33 +3483,41 @@
 		return;
 	}
 
-	if (chip_name == 0x7531 ||  chip_name == 0x7988) {
-		reg= PFC_RX_COUNTER_L(port);
+	if (chip_name == 0x7531 || chip_name == 0x7988) {
+		reg = PFC_RX_COUNTER_L(port);
 		reg_read(reg, &value);
 		user_pri = value & 0xff;
-		printf("\n port %d rx pfc (up=0)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d rx pfc (up=0)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff00) >> 8;
-		printf("\n port %d rx pfc (up=1)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d rx pfc (up=1)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff0000) >> 16;
-		printf("\n port %d rx pfc (up=2)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d rx pfc (up=2)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff000000) >> 24;
-		printf("\n port %d rx pfc (up=3)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d rx pfc (up=3)pause on counter is %d.\n",
+		       port, user_pri);
 
-		reg= PFC_RX_COUNTER_H(port);
+		reg = PFC_RX_COUNTER_H(port);
 		reg_read(reg, &value);
 		user_pri = value & 0xff;
-		printf("\n port %d rx pfc (up=4)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d rx pfc (up=4)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff00) >> 8;
-		printf("\n port %d rx pfc (up=5)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d rx pfc (up=5)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff0000) >> 16;
-		printf("\n port %d rx pfc (up=6)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d rx pfc (up=6)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff000000) >> 24;
-		printf("\n port %d rx pfc (up=7)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d rx pfc (up=7)pause on counter is %d.\n",
+		       port, user_pri);
 
 		/* for rx counter could be updated successfully */
 		reg_read(PMSR_P(port), &value);
 		reg_read(PMSR_P(port), &value);
-	}else {
+	} else {
 		printf("\nCommand not support by this chip.\n");
 	}
 
@@ -3408,9 +3525,9 @@
 
 void pfc_get_tx_counter(int argc, char *argv[])
 {
-	int port;
-	unsigned int value, reg;
-	unsigned int user_pri;
+	int port = 0;
+	unsigned int value = 0, reg = 0;
+	unsigned int user_pri = 0;
 
 	port = strtoul(argv[3], NULL, 0);
 	if (port < 0 || 6 < port) {
@@ -3419,83 +3536,99 @@
 	}
 
 	if (chip_name == 0x7531 || chip_name == 0x7988) {
-		reg= PFC_TX_COUNTER_L(port);
+		reg = PFC_TX_COUNTER_L(port);
 		reg_read(reg, &value);
 		user_pri = value & 0xff;
-		printf("\n port %d tx pfc (up=0)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d tx pfc (up=0)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff00) >> 8;
-		printf("\n port %d tx pfc (up=1)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d tx pfc (up=1)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff0000) >> 16;
-		printf("\n port %d tx pfc (up=2)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d tx pfc (up=2)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff000000) >> 24;
-		printf("\n port %d tx pfc (up=3)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d tx pfc (up=3)pause on counter is %d.\n",
+		       port, user_pri);
 
-		reg= PFC_TX_COUNTER_H(port);
+		reg = PFC_TX_COUNTER_H(port);
 		reg_read(reg, &value);
 		user_pri = value & 0xff;
-		printf("\n port %d tx pfc (up=4)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d tx pfc (up=4)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff00) >> 8;
-		printf("\n port %d tx pfc (up=5)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d tx pfc (up=5)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff0000) >> 16;
-		printf("\n port %d tx pfc (up=6)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d tx pfc (up=6)pause on counter is %d.\n",
+		       port, user_pri);
 		user_pri = (value & 0xff000000) >> 24;
-		printf("\n port %d tx pfc (up=7)pause on counter is %d.\n", port,user_pri);
+		printf("\n port %d tx pfc (up=7)pause on counter is %d.\n",
+		       port, user_pri);
 
 		/* for tx counter could be updated successfully */
 		reg_read(PMSR_P(port), &value);
 		reg_read(PMSR_P(port), &value);
-	}else {
-		 printf("\nCommand not support by this chip.\n");
+	} else {
+		printf("\nCommand not support by this chip.\n");
 	}
 }
 
-void read_output_queue_counters()
+void read_output_queue_counters(int argc, char *argv[])
 {
-	unsigned int port=0;
-	unsigned int value, output_queue;
-	unsigned int base=0x220;
+	unsigned int port = 0;
+	unsigned int value = 0, output_queue = 0;
+	unsigned int base = 0x220;
 
 	for (port = 0; port < 7; port++) {
-		reg_write(0x7038, base + (port *4));
+		reg_write(0x7038, base + (port * 4));
 		reg_read(0x7034, &value);
 		output_queue = value & 0xff;
-		printf("\n port %d  output queue 0 counter is %d.\n", port,output_queue);
+		printf("\n port %d  output queue 0 counter is %d.\n", port,
+		       output_queue);
 		output_queue = (value & 0xff00) >> 8;
-		printf("\n port %d  output queue 1 counter is %d.\n", port,output_queue);
+		printf("\n port %d  output queue 1 counter is %d.\n", port,
+		       output_queue);
 
-		reg_write(0x7038, base + (port *4) + 1);
+		reg_write(0x7038, base + (port * 4) + 1);
 		reg_read(0x7034, &value);
 		output_queue = value & 0xff;
-		printf("\n port %d  output queue 2 counter is %d.\n", port,output_queue);
+		printf("\n port %d  output queue 2 counter is %d.\n", port,
+		       output_queue);
 		output_queue = (value & 0xff00) >> 8;
-		printf("\n port %d  output queue 3 counter is %d.\n", port,output_queue);
+		printf("\n port %d  output queue 3 counter is %d.\n", port,
+		       output_queue);
 
-		reg_write(0x7038, base + (port *4) + 2);
+		reg_write(0x7038, base + (port * 4) + 2);
 		reg_read(0x7034, &value);
 		output_queue = value & 0xff;
-		printf("\n port %d  output queue 4 counter is %d.\n", port,output_queue);
+		printf("\n port %d  output queue 4 counter is %d.\n", port,
+		       output_queue);
 		output_queue = (value & 0xff00) >> 8;
-		printf("\n port %d  output queue 5 counter is %d.\n", port,output_queue);
+		printf("\n port %d  output queue 5 counter is %d.\n", port,
+		       output_queue);
 
-		reg_write(0x7038, base + (port *4) + 3);
+		reg_write(0x7038, base + (port * 4) + 3);
 		reg_read(0x7034, &value);
 		output_queue = value & 0xff;
-		printf("\n port %d  output queue 6 counter is %d.\n", port,output_queue);
+		printf("\n port %d  output queue 6 counter is %d.\n", port,
+		       output_queue);
 		output_queue = (value & 0xff00) >> 8;
-		printf("\n port %d  output queue 7 counter is %d.\n", port,output_queue);
+		printf("\n port %d  output queue 7 counter is %d.\n", port,
+		       output_queue);
 	}
 }
 
-void read_free_page_counters()
+void read_free_page_counters(int argc, char *argv[])
 {
-	unsigned int value;
-	unsigned int free_page,free_page_last_read;
-	unsigned int fc_free_blk_lothd,fc_free_blk_hithd;
-	unsigned int fc_port_blk_thd,fc_port_blk_hi_thd;
-	unsigned int queue[8]={0};
+	unsigned int value = 0;
+	unsigned int free_page = 0, free_page_last_read = 0;
+	unsigned int fc_free_blk_lothd = 0, fc_free_blk_hithd = 0;
+	unsigned int fc_port_blk_thd = 0, fc_port_blk_hi_thd = 0;
+	unsigned int queue[8] = { 0 };
 
 	if (chip_name == 0x7531 || chip_name == 0x7988) {
-		/* get system free page link counter*/
+		/* get system free page link counter */
 		reg_read(0x1fc0, &value);
 		free_page = value & 0xFFF;
 		free_page_last_read = (value & 0xFFF0000) >> 16;
@@ -3512,17 +3645,17 @@
 
 		/* get queue flow control waterwark */
 		reg_read(0x1fe8, &value);
-		queue[0]= value & 0x3F;
-		queue[1]= (value & 0x3F00) >> 8;
-		queue[2]= (value & 0x3F0000) >> 16;
-		queue[3]= (value & 0x3F000000) >> 24;
+		queue[0] = value & 0x3F;
+		queue[1] = (value & 0x3F00) >> 8;
+		queue[2] = (value & 0x3F0000) >> 16;
+		queue[3] = (value & 0x3F000000) >> 24;
 		reg_read(0x1fec, &value);
-		queue[4]= value & 0x3F;
-		queue[5]= (value & 0x3F00) >> 8;
-		queue[6]= (value & 0x3F0000) >> 16;
-		queue[7]= (value & 0x3F000000) >> 24;
+		queue[4] = value & 0x3F;
+		queue[5] = (value & 0x3F00) >> 8;
+		queue[6] = (value & 0x3F0000) >> 16;
+		queue[7] = (value & 0x3F000000) >> 24;
 	} else {
-		/* get system free page link counter*/
+		/* get system free page link counter */
 		reg_read(0x1fc0, &value);
 		free_page = value & 0x3FF;
 		free_page_last_read = (value & 0x3FF0000) >> 16;
@@ -3540,50 +3673,61 @@
 
 		/* get queue flow control waterwark */
 		reg_read(0x1fe4, &value);
-		queue[0]= value & 0xF;
-		queue[1]= (value & 0xF0) >> 4;
-		queue[2]= (value & 0xF00) >> 8;
-		queue[3]= (value & 0xF000) >>12;
-		queue[4]= (value & 0xF0000) >>16;
-		queue[5]= (value & 0xF00000) >> 20;
-		queue[6]= (value & 0xF000000) >> 24;
-		queue[7]= (value & 0xF0000000) >> 28;
+		queue[0] = value & 0xF;
+		queue[1] = (value & 0xF0) >> 4;
+		queue[2] = (value & 0xF00) >> 8;
+		queue[3] = (value & 0xF000) >> 12;
+		queue[4] = (value & 0xF0000) >> 16;
+		queue[5] = (value & 0xF00000) >> 20;
+		queue[6] = (value & 0xF000000) >> 24;
+		queue[7] = (value & 0xF0000000) >> 28;
 	}
 
-	printf("<===Free Page=======Current=======Last Read access=====> \n ");
-	printf("	                                                 \n ");
-	printf(" page counter      %u                %u               \n ",free_page,free_page_last_read);
-	printf("                                                        \n ");
-	printf("========================================================= \n ");
-	printf("<===Type=======High threshold======Low threshold=========\n ");
-	printf("                                                        \n ");
-	printf("  system:         %u                 %u               \n", fc_free_blk_hithd*2,  fc_free_blk_lothd*2);
-	printf("    port:         %u                 %u               \n", fc_port_blk_hi_thd*2, fc_port_blk_thd*2);
-	printf(" queue 0:         %u                 NA                \n", queue[0]);
-	printf(" queue 1:         %u                 NA                \n", queue[1]);
-	printf(" queue 2:         %u                 NA                 \n", queue[2]);
-	printf(" queue 3:         %u                 NA                \n", queue[3]);
-	printf(" queue 4:         %u                 NA                \n", queue[4]);
-	printf(" queue 5:         %u                 NA                \n", queue[5]);
-	printf(" queue 6:         %u                 NA                \n", queue[6]);
-	printf(" queue 7:         %u                 NA                \n", queue[7]);
-	printf("=========================================================\n ");
+	printf("<===Free Page=======Current=======Last Read access=====>\n");
+	printf("\n");
+	printf(" page counter      %u                %u\n ",
+	       free_page, free_page_last_read);
+	printf("\n ");
+	printf("=========================================================\n");
+	printf("<===Type=======High threshold======Low threshold=========\n");
+	printf("\n ");
+	printf("  system:         %u                 %u\n",
+	       fc_free_blk_hithd * 2, fc_free_blk_lothd * 2);
+	printf("    port:         %u                 %u\n",
+	       fc_port_blk_hi_thd * 2, fc_port_blk_thd * 2);
+	printf(" queue 0:         %u                 NA\n",
+	       queue[0]);
+	printf(" queue 1:         %u                 NA\n",
+	       queue[1]);
+	printf(" queue 2:         %u                 NA\n",
+	       queue[2]);
+	printf(" queue 3:         %u                 NA\n",
+	       queue[3]);
+	printf(" queue 4:         %u                 NA\n",
+	       queue[4]);
+	printf(" queue 5:         %u                 NA\n",
+	       queue[5]);
+	printf(" queue 6:         %u                 NA\n",
+	       queue[6]);
+	printf(" queue 7:         %u                 NA\n",
+	       queue[7]);
+	printf("=========================================================\n");
 }
 
 void eee_enable(int argc, char *argv[])
 {
-	unsigned long enable;
-	unsigned int value;
-	unsigned int eee_cap;
+	unsigned long enable = 0;
+	unsigned int value = 0;
+	unsigned int eee_cap = 0;
 	unsigned int eee_en_bitmap = 0;
-	unsigned long port_map;
+	unsigned long port_map = 0;
 	long port_num = -1;
-	int p;
+	int p = 0;
 
 	if (argc < 3)
 		goto error;
 
-	/*Check the input parameters is right or not.*/
+	/* Check the input parameters is right or not. */
 	if (!strncmp(argv[2], "enable", 7))
 		enable = 1;
 	else if (!strncmp(argv[2], "disable", 8))
@@ -3603,23 +3747,25 @@
 			port_map = 0;
 			for (p = 0; p < MAX_PHY_PORT; p++) {
 				if (argv[3][p] != '0' && argv[3][p] != '1') {
-					printf("portmap format error, should be combination of 0 or 1\n");
+					printf
+					    ("portmap format error, should be combination of 0 or 1\n");
 					goto error;
 				}
 				port_map |= ((argv[3][p] - '0') << p);
 			}
 		} else {
-			printf("port_no or portmap format error, should be length of 1 or 5\n");
+			printf
+			    ("port_no or portmap format error, should be length of 1 or 5\n");
 			goto error;
 		}
 	} else {
 		port_map = 0x1f;
 	}
 
-	eee_cap = (enable)? 6: 0;
+	eee_cap = (enable) ? 6 : 0;
 	for (p = 0; p < MAX_PHY_PORT; p++) {
 		/* port_map describe p0p1p2p3p4 from left to rignt */
-		if(!!(port_map & (1 << p)))
+		if (!!(port_map & (1 << p)))
 			mii_mgr_c45_write(p, 0x7, 0x3c, eee_cap);
 
 		mii_mgr_c45_read(p, 0x7, 0x3c, &value);
@@ -3642,7 +3788,7 @@
 		printf("\nCommand not support by this chip.\n");
 	}
 
-	printf("EEE(802.3az) %s", (enable)? "enable": "disable");
+	printf("EEE(802.3az) %s", (enable) ? "enable" : "disable");
 	if (argc == 4) {
 		if (port_num >= 0)
 			printf(" port%ld", port_num);
@@ -3661,9 +3807,9 @@
 
 void eee_dump(int argc, char *argv[])
 {
-	unsigned int cap, lp_cap;
+	unsigned int cap = 0, lp_cap = 0;
 	long port = -1;
-	int p;
+	int p = 0;
 
 	if (argc > 3) {
 		if (strlen(argv[3]) > 1) {
@@ -3674,7 +3820,7 @@
 		port = strtol(argv[3], (char **)NULL, 0);
 		if (port < 0 || port > MAX_PHY_PORT) {
 			printf("port# format error, should be 0 to %d\n",
-				       MAX_PHY_PORT);
+			       MAX_PHY_PORT);
 			return;
 		}
 	}
@@ -3716,7 +3862,7 @@
 	printf("\n");
 }
 
-void read_mib_counters()
+void read_mib_counters(int argc, char *argv[])
 {
 	printf("===================== %8s %8s %8s %8s %8s %8s %8s\n",
 	       "Port0", "Port1", "Port2", "Port3", "Port4", "Port5", "Port6");
@@ -3760,14 +3906,13 @@
 	dump_each_port(0x408C);
 }
 
-void clear_mib_counters()
+void clear_mib_counters(int argc, char *argv[])
 {
 	reg_write(0x4fe0, 0xf0);
-	read_mib_counters();
+	read_mib_counters(argc, argv);
 	reg_write(0x4fe0, 0x800000f0);
 }
 
-
 void exit_free()
 {
 	free(attres);