[BT] Make rumble more responsive

darthcloud · darthcloud · commit 4beea29e6587 · 2025-07-13T17:30:48.000-04:00
diff --git a/main/adapter/adapter.c b/main/adapter/adapter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2024, Jacques Gagnon
+ * Copyright (c) 2019-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -471,17 +471,14 @@ void adapter_fb_stop_timer_stop(uint8_t dev_id) {
     }
 }
 
-uint32_t adapter_bridge_fb(struct raw_fb *fb_data, struct bt_data *bt_data) {
-    uint32_t ret = 0;
+bool adapter_bridge_fb(struct raw_fb *fb_data, struct bt_data *bt_data) {
+    bool ret = false;
 
     if (wired_adapter.system_id != WIRED_AUTO && bt_data && bt_data->base.pids) {
         wired_fb_to_generic(config.out_cfg[bt_data->base.pids->id].dev_mode, fb_data, &fb_input);
 
         if (bt_data->base.pids->type != BT_NONE) {
-            wireless_fb_from_generic(&fb_input, bt_data);
-            if (fb_data->header.type == FB_TYPE_RUMBLE) {
-                ret = fb_input.state;
-            }
+            ret = wireless_fb_from_generic(&fb_input, bt_data);
         }
     }
     return ret;
diff --git a/main/adapter/adapter.h b/main/adapter/adapter.h
@@ -570,7 +570,7 @@ struct bt_adapter {
 typedef int32_t (*to_generic_t)(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data);
 typedef void (*from_generic_t)(int32_t dev_mode, struct wired_ctrl *ctrl_data, struct wired_data *wired_data);
 typedef void (*fb_to_generic_t)(int32_t dev_mode, struct raw_fb *raw_fb_data, struct generic_fb *fb_data);
-typedef void (*fb_from_generic_t)(struct generic_fb *fb_data, struct bt_data *bt_data);
+typedef bool (*fb_from_generic_t)(struct generic_fb *fb_data, struct bt_data *bt_data);
 typedef void (*meta_init_t)(struct wired_ctrl *ctrl_data);
 typedef void (*buffer_init_t)(int32_t dev_mode, struct wired_data *wired_data);
 
@@ -589,7 +589,7 @@ void adapter_init_buffer(uint8_t wired_id);
 void adapter_bridge(struct bt_data *bt_data);
 void adapter_fb_stop_timer_start(uint8_t dev_id, uint64_t dur_us);
 void adapter_fb_stop_timer_stop(uint8_t dev_id);
-uint32_t adapter_bridge_fb(struct raw_fb *fb_data, struct bt_data *bt_data);
+bool adapter_bridge_fb(struct raw_fb *fb_data, struct bt_data *bt_data);
 void adapter_q_fb(struct raw_fb *fb_data);
 void adapter_toggle_fb(uint32_t wired_id, uint32_t duration_us, uint8_t lf_pwr, uint8_t hf_pwr);
 void adapter_init(void);
diff --git a/main/adapter/wireless/hid_generic.c b/main/adapter/wireless/hid_generic.c
@@ -779,7 +779,8 @@ int32_t hid_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data)
     return 0;
 }
 
-void hid_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
+bool hid_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
+    bool ret = true;
 
     switch (fb_data->type) {
         case FB_TYPE_RUMBLE:
@@ -899,5 +900,6 @@ void hid_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
             }
             break;
     }
+    return ret;
 }
 
diff --git a/main/adapter/wireless/hid_generic.h b/main/adapter/wireless/hid_generic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, Jacques Gagnon
+ * Copyright (c) 2019-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,6 +8,6 @@
 #include "adapter/adapter.h"
 
 int32_t hid_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data);
-void hid_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
+bool hid_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
 
 #endif /* _HID_GENERIC_H_ */
diff --git a/main/adapter/wireless/ps.c b/main/adapter/wireless/ps.c
@@ -282,7 +282,8 @@ int32_t ps_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data)
     return 0;
 }
 
-void ps_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
+bool ps_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
+    bool ret = true;
     switch (bt_data->base.pids->subtype) {
         case BT_PS5_DS:
             ps5_fb_from_generic(fb_data, bt_data);
@@ -291,4 +292,5 @@ void ps_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
             ps4_fb_from_generic(fb_data, bt_data);
             break;
     }
+    return ret;
 }
diff --git a/main/adapter/wireless/ps.h b/main/adapter/wireless/ps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, Jacques Gagnon
+ * Copyright (c) 2019-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,6 +8,6 @@
 #include "adapter/adapter.h"
 
 int32_t ps_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data);
-void ps_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
+bool ps_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
 
 #endif /* _SRC_PS_H_ */
diff --git a/main/adapter/wireless/ps3.c b/main/adapter/wireless/ps3.c
@@ -136,8 +136,9 @@ int32_t ps3_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data)
     return 0;
 }
 
-void ps3_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
+bool ps3_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
     struct bt_hidp_ps3_set_conf *set_conf = (struct bt_hidp_ps3_set_conf *)bt_data->base.output;
+    bool ret = true;
 
     switch (fb_data->type) {
         case FB_TYPE_RUMBLE:
@@ -162,4 +163,5 @@ void ps3_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
             set_conf->leds = (led_dev_id_map[bt_data->base.pids->out_idx] << 1);
             break;
     }
+    return ret;
 }
diff --git a/main/adapter/wireless/ps3.h b/main/adapter/wireless/ps3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, Jacques Gagnon
+ * Copyright (c) 2019-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,6 +8,6 @@
 #include "adapter/adapter.h"
 
 int32_t ps3_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data);
-void ps3_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
+bool ps3_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
 
 #endif /* _PS3_H_ */
diff --git a/main/adapter/wireless/sw.c b/main/adapter/wireless/sw.c
@@ -511,8 +511,9 @@ int32_t sw_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data)
     return -1;
 }
 
-void sw_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
+bool sw_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
     struct bt_hidp_sw_conf *set_conf = (struct bt_hidp_sw_conf *)bt_data->base.output;
+    bool ret = true;
     /* 8bitdo wont rumble w/ set_conf so we need keep track of fb_type somehow */
     bt_data->base.output[127] = fb_data->type;
 
@@ -540,5 +541,6 @@ void sw_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
             set_conf->subcmd_data[0] = led_dev_id_map[bt_data->base.pids->out_idx];
             break;
     }
+    return ret;
 }
 
diff --git a/main/adapter/wireless/sw.h b/main/adapter/wireless/sw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, Jacques Gagnon
+ * Copyright (c) 2019-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,6 +8,6 @@
 #include "adapter/adapter.h"
 
 int32_t sw_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data);
-void sw_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
+bool sw_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
 
 #endif /* _SW_H_ */
diff --git a/main/adapter/wireless/sw2.c b/main/adapter/wireless/sw2.c
@@ -303,8 +303,9 @@ int32_t sw2_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data)
     return 0;
 }
 
-void sw2_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
+bool sw2_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
     struct bt_hidp_sw2_out *out = (struct bt_hidp_sw2_out *)bt_data->base.output;
+    bool ret = true;
 
     switch (bt_data->base.pid) {
         case SW2_LJC_PID:
@@ -339,6 +340,8 @@ void sw2_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
             }
             break;
         case SW2_GC_PID:
+        {
+            uint8_t cur_val = bt_data->base.output[2];
             switch (fb_data->type) {
                 case FB_TYPE_RUMBLE:
                     if (fb_data->state) {
@@ -352,8 +355,11 @@ void sw2_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
                     bt_data->base.output[13] = bt_hid_led_dev_id_map[bt_data->base.pids->out_idx];
                     break;
             }
+            ret = (cur_val != bt_data->base.output[2]);
             break;
+        }
         default:
             printf("# Unknown pid : %04X\n", bt_data->base.pid);
     }
+    return ret;
 }
diff --git a/main/adapter/wireless/sw2.h b/main/adapter/wireless/sw2.h
@@ -8,6 +8,6 @@
 #include "adapter/adapter.h"
 
 int32_t sw2_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data);
-void sw2_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
+bool sw2_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
 
 #endif /* _SRC_SW2_H_ */
diff --git a/main/adapter/wireless/wii.c b/main/adapter/wireless/wii.c
@@ -492,8 +492,9 @@ int32_t wii_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data)
     }
 }
 
-void wii_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
+bool wii_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
     struct bt_hidp_wii_conf *set_conf = (struct bt_hidp_wii_conf *)bt_data->base.output;
+    uint8_t cur_val = set_conf->conf;
 
     switch (fb_data->type) {
         case FB_TYPE_RUMBLE:
@@ -509,4 +510,5 @@ void wii_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
             set_conf->conf |= (led_dev_id_map[bt_data->base.pids->id] << 4);
             break;
     }
+    return (cur_val != set_conf->conf);
 }
diff --git a/main/adapter/wireless/wii.h b/main/adapter/wireless/wii.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, Jacques Gagnon
+ * Copyright (c) 2019-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,6 +8,6 @@
 #include "adapter/adapter.h"
 
 int32_t wii_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data);
-void wii_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
+bool wii_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
 
 #endif /* _WII_H_ */
diff --git a/main/adapter/wireless/wireless.c b/main/adapter/wireless/wireless.c
@@ -40,9 +40,13 @@ int32_t wireless_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_
     return ret;
 }
 
-void wireless_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
+bool wireless_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data) {
+    bool ret = false;
+
     if (fb_from_generic_func[bt_data->base.pids->type]) {
-        fb_from_generic_func[bt_data->base.pids->type](fb_data, bt_data);
+        ret = fb_from_generic_func[bt_data->base.pids->type](fb_data, bt_data);
     }
+
+    return ret;
 }
 
diff --git a/main/adapter/wireless/wireless.h b/main/adapter/wireless/wireless.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Jacques Gagnon
+ * Copyright (c) 2021-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,6 +8,6 @@
 #include "adapter/adapter.h"
 
 int32_t wireless_to_generic(struct bt_data *bt_data, struct wireless_ctrl *ctrl_data);
-void wireless_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
+bool wireless_fb_from_generic(struct generic_fb *fb_data, struct bt_data *bt_data);
 
 #endif /* _WIRELESS_H_ */
diff --git a/main/bluetooth/hidp/sw2.c b/main/bluetooth/hidp/sw2.c
@@ -260,7 +260,8 @@ void bt_hid_sw2_hdlr(struct bt_dev *device, uint16_t att_handle, uint8_t *data,
         case BT_HIDP_SW2_REPORT_TYPE1_ATT_HDL:
             bt_host_bridge(device, 1, data, len);
             struct bt_data *bt_data = &bt_adapter.data[device->ids.id];
-            if (bt_data && config.out_cfg[device->ids.out_idx].acc_mode & ACC_RUMBLE) {
+            if (bt_data && bt_data->base.pid != SW2_GC_PID
+                    && config.out_cfg[device->ids.out_idx].acc_mode & ACC_RUMBLE) {
                 bt_hid_cmd_sw2_out(device, bt_data->base.output);
             }
             break;
diff --git a/main/bluetooth/host.c b/main/bluetooth/host.c
@@ -202,13 +202,12 @@ static void bt_tx_task(void *param) {
 }
 
 static void bt_fb_task(void *param) {
-    static bool rumble_en = false;
-    static bool rumble_on = false;
     uint32_t *fb_len;
     struct raw_fb *fb_data = NULL;
     uint32_t delay_cnt = BT_FB_TASK_DELAY_CNT; /* 100ms * 30 = 3sec */
 
     while(1) {
+        bool fb_changed = false;
         /* Look for rumble/led feedback data */
         while ((fb_data = (struct raw_fb *)queue_bss_dequeue(wired_adapter.input_q_hdl, &fb_len))) {
             struct bt_dev *device = NULL;
@@ -236,8 +235,7 @@ static void bt_fb_task(void *param) {
                     /* Fallthrough */
                 case FB_TYPE_RUMBLE:
                     if (bt_data) {
-                        rumble_en = true;
-                        rumble_on = (bool)adapter_bridge_fb(fb_data, bt_data);
+                        fb_changed = adapter_bridge_fb(fb_data, bt_data);
                         delay_cnt = 0;
                     }
                     break;
@@ -257,20 +255,20 @@ static void bt_fb_task(void *param) {
             queue_bss_return(wired_adapter.input_q_hdl, (uint8_t *)fb_data, fb_len);
         }
 
-        /* TX Feedback every 100 ms if rumble on, every 3 sec otherwise */
-        if (delay_cnt-- == 0 || rumble_on) {
+        /* TX Feedback every 10 ms if rumble on, every 3 sec otherwise */
+        if (delay_cnt-- == 0 || fb_changed) {
             for (uint32_t i = 0; i < BT_MAX_DEV; i++) {
                 struct bt_dev *device = &bt_dev[i];
 
-                if (rumble_en && atomic_test_bit(&device->flags, BT_DEV_HID_INIT_DONE)) {
+                if (atomic_test_bit(&device->flags, BT_DEV_HID_INIT_DONE)) {
                     struct bt_data *bt_data = &bt_adapter.data[device->ids.id];
 
                     bt_hid_feedback(device, bt_data->base.output);
                 }
             }
             delay_cnt = BT_FB_TASK_DELAY_CNT;
         }
-        vTaskDelay(100 / portTICK_PERIOD_MS);
+        vTaskDelay(10 / portTICK_PERIOD_MS);
     }
 }
 
@@ -305,7 +303,7 @@ static void bt_host_task(void *param) {
         wired_adapter.data[0].output[16], wired_adapter.data[0].output[17]);
 #endif
 
-        vTaskDelay(16 / portTICK_PERIOD_MS);
+        vTaskDelay(20 / portTICK_PERIOD_MS);
     }
 }
 
diff --git a/main/wired/maple.c b/main/wired/maple.c
diff --git a/main/wired/ps_spi.c b/main/wired/ps_spi.c

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2019-2024, Jacques Gagnon`
	`2`	`+ * Copyright (c) 2019-2025, Jacques Gagnon`
`3`	`3`	`* SPDX-License-Identifier: Apache-2.0`
`4`	`4`	`*/`
`5`	`5`
`@@ -471,17 +471,14 @@ void adapter_fb_stop_timer_stop(uint8_t dev_id) {`
`471`	`471`	`}`
`472`	`472`	`}`
`473`	`473`
`474`		`-uint32_t adapter_bridge_fb(struct raw_fb fb_data, struct bt_data bt_data) {`
`475`		`- uint32_t ret = 0;`
	`474`	`+bool adapter_bridge_fb(struct raw_fb fb_data, struct bt_data bt_data) {`
	`475`	`+ bool ret = false;`
`476`	`476`
`477`	`477`	`if (wired_adapter.system_id != WIRED_AUTO && bt_data && bt_data->base.pids) {`
`478`	`478`	`wired_fb_to_generic(config.out_cfg[bt_data->base.pids->id].dev_mode, fb_data, &fb_input);`
`479`	`479`
`480`	`480`	`if (bt_data->base.pids->type != BT_NONE) {`
`481`		`- wireless_fb_from_generic(&fb_input, bt_data);`
`482`		`- if (fb_data->header.type == FB_TYPE_RUMBLE) {`
`483`		`- ret = fb_input.state;`
`484`		`- }`
	`481`	`+ ret = wireless_fb_from_generic(&fb_input, bt_data);`
`485`	`482`	`}`
`486`	`483`	`}`
`487`	`484`	`return ret;`
Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,8 @@ int32_t hid_to_generic(struct bt_data bt_data, struct wireless_ctrl ctrl_data)`
`779`	`779`	`return 0;`
`780`	`780`	`}`
`781`	`781`
`782`		`-void hid_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
	`782`	`+bool hid_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
	`783`	`+ bool ret = true;`
`783`	`784`
`784`	`785`	`switch (fb_data->type) {`
`785`	`786`	`case FB_TYPE_RUMBLE:`
`@@ -899,5 +900,6 @@ void hid_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
`899`	`900`	`}`
`900`	`901`	`break;`
`901`	`902`	`}`
	`903`	`+ return ret;`
`902`	`904`	`}`
`903`	`905`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,8 @@ int32_t ps_to_generic(struct bt_data bt_data, struct wireless_ctrl ctrl_data)`
`282`	`282`	`return 0;`
`283`	`283`	`}`
`284`	`284`
`285`		`-void ps_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
	`285`	`+bool ps_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
	`286`	`+ bool ret = true;`
`286`	`287`	`switch (bt_data->base.pids->subtype) {`
`287`	`288`	`case BT_PS5_DS:`
`288`	`289`	`ps5_fb_from_generic(fb_data, bt_data);`
`@@ -291,4 +292,5 @@ void ps_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
`291`	`292`	`ps4_fb_from_generic(fb_data, bt_data);`
`292`	`293`	`break;`
`293`	`294`	`}`
	`295`	`+ return ret;`
`294`	`296`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,9 @@ int32_t ps3_to_generic(struct bt_data bt_data, struct wireless_ctrl ctrl_data)`
`136`	`136`	`return 0;`
`137`	`137`	`}`
`138`	`138`
`139`		`-void ps3_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
	`139`	`+bool ps3_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
`140`	`140`	`struct bt_hidp_ps3_set_conf set_conf = (struct bt_hidp_ps3_set_conf )bt_data->base.output;`
	`141`	`+ bool ret = true;`
`141`	`142`
`142`	`143`	`switch (fb_data->type) {`
`143`	`144`	`case FB_TYPE_RUMBLE:`
`@@ -162,4 +163,5 @@ void ps3_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
`162`	`163`	`set_conf->leds = (led_dev_id_map[bt_data->base.pids->out_idx] << 1);`
`163`	`164`	`break;`
`164`	`165`	`}`
	`166`	`+ return ret;`
`165`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -511,8 +511,9 @@ int32_t sw_to_generic(struct bt_data bt_data, struct wireless_ctrl ctrl_data)`
`511`	`511`	`return -1;`
`512`	`512`	`}`
`513`	`513`
`514`		`-void sw_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
	`514`	`+bool sw_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
`515`	`515`	`struct bt_hidp_sw_conf set_conf = (struct bt_hidp_sw_conf )bt_data->base.output;`
	`516`	`+ bool ret = true;`
`516`	`517`	`/* 8bitdo wont rumble w/ set_conf so we need keep track of fb_type somehow */`
`517`	`518`	`bt_data->base.output[127] = fb_data->type;`
`518`	`519`
`@@ -540,5 +541,6 @@ void sw_fb_from_generic(struct generic_fb fb_data, struct bt_data bt_data) {`
`540`	`541`	`set_conf->subcmd_data[0] = led_dev_id_map[bt_data->base.pids->out_idx];`
`541`	`542`	`break;`
`542`	`543`	`}`
	`544`	`+ return ret;`
`543`	`545`	`}`
`544`	`546`