add 'usb' to function names; export some important functions

1 files changed, 13 insertions, 13 deletions

diff --git a/demo/USB_Demo.ttcn b/demo/USB_Demo.ttcn
index 8babc72..0cdc43a 100644
--- a/demo/USB_Demo.ttcn
+++ b/demo/USB_Demo.ttcn
@@ -16,7 +16,7 @@ modulepar {
 	hexstring mp_product_id := '0017'H;
 }
 
-private function f_init() runs on USB_CT {
+function f_init_usb() runs on USB_CT {
 	map(self:USB, system:USB);
 
 	var USB_result res;
@@ -109,7 +109,7 @@ runs on USB_CT return octetstring
 	return ''O;
 }
 
-private function f_get_desc_std(USB_DescriptorType dtype, integer idx, integer len)
+function f_usb_get_desc_std(USB_DescriptorType dtype, integer idx, integer len)
 runs on USB_CT return USB_StandardDescriptors
 {
 	var octetstring raw := f_get_desc(dtype, idx, len);
@@ -176,29 +176,29 @@ runs on USB_CT return integer
 }
 
 testcase TC_get_desc_device() runs on USB_CT {
-	f_init();
+	f_init_usb();
 	var USB_StandardDescriptors descs;
-	descs := f_get_desc_std(USB_DescriptorType_DEVICE, 0, 256);
+	descs := f_usb_get_desc_std(USB_DescriptorType_DEVICE, 0, 256);
 	/* FIXME: do some verifications and set veridct */
 	setverdict(pass);
 }
 testcase TC_get_desc_device_illegal_idx() runs on USB_CT {
-	f_init();
+	f_init_usb();
 	f_get_desc_exp_fail(USB_DescriptorType_DEVICE, 23, 256);
 }
 testcase TC_get_desc_config() runs on USB_CT {
-	f_init();
+	f_init_usb();
 	var USB_StandardDescriptors descs;
-	descs := f_get_desc_std(USB_DescriptorType_CONFIGURATION, 0, 256);
+	descs := f_usb_get_desc_std(USB_DescriptorType_CONFIGURATION, 0, 256);
 	/* FIXME: do some verifications and set veridct */
 	setverdict(pass);
 }
 testcase TC_get_desc_config_illegal_idx() runs on USB_CT {
-	f_init();
+	f_init_usb();
 	f_get_desc_exp_fail(USB_DescriptorType_CONFIGURATION, 23, 256);
 }
 testcase TC_get_config() runs on USB_CT {
-	f_init();
+	f_init_usb();
 	var integer cfg_num := f_get_config();
 	if (cfg_num == 0) {
 		setverdict(pass);
@@ -207,7 +207,7 @@ testcase TC_get_config() runs on USB_CT {
 	}
 }
 testcase TC_get_interface() runs on USB_CT {
-	f_init();
+	f_init_usb();
 	var integer altsett_num := f_get_interface(0);
 	if (altsett_num == 0) {
 		setverdict(pass);
@@ -216,7 +216,7 @@ testcase TC_get_interface() runs on USB_CT {
 	}
 }
 testcase TC_get_status() runs on USB_CT {
-	f_init();
+	f_init_usb();
 
 	/* valid get_status on device */
 	f_get_status(RequestRecipient_Device, 0);
@@ -228,7 +228,7 @@ testcase TC_get_status() runs on USB_CT {
 	f_get_status(RequestRecipient_Endpoint, 1);
 }
 testcase TC_get_status_invalid() runs on USB_CT {
-	f_init();
+	f_init_usb();
 
 	f_DevReq_exp_fail(ts_DevReq_GET_STATUS(RequestRecipient_Device, 1));
 
@@ -243,7 +243,7 @@ testcase TC_get_status_invalid() runs on USB_CT {
 testcase TC_foobar() runs on USB_CT {
 	var USB_result res;
 
-	f_init();
+	f_init_usb();
 
 	var USB_descriptor desc;
 	USB.send(ts_USB_get_device_descriptor(42));