Skip to content

Commit

Permalink
Move default transport function prototype to jerryscript-port-default.h
Browse files Browse the repository at this point in the history
JerryScript-DCO-1.0-Signed-off-by: Jimmy Huang jimmy.huang@intel.com
  • Loading branch information
jimmy-huang committed Apr 9, 2018
1 parent 1445a2f commit 056b7f1
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 32 deletions.
6 changes: 0 additions & 6 deletions jerry-core/include/jerryscript-port.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,6 @@ struct jerry_debugger_transport_t
uint32_t *buffer_offset);
};

/**
* The default transport layer that uses TCP socket
* other transports can be added like usb, bluetooth
*/
struct jerry_debugger_transport_t *jerry_port_init_socket_transport (uint16_t tcp_port);

/**
* Makes the process sleep for a given time.
*/
Expand Down
4 changes: 2 additions & 2 deletions jerry-main/main-unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ main (int argc,
jerry_init (flags);
if (start_debug_server)
{
jerry_debugger_init (jerry_port_init_socket_transport (debug_port));
jerry_debugger_init (jerry_port_default_init_socket_transport (debug_port));
}

register_js_function ("assert", jerryx_handler_assert);
Expand Down Expand Up @@ -661,7 +661,7 @@ main (int argc,
jerry_cleanup ();

jerry_init (flags);
jerry_debugger_init (jerry_port_init_socket_transport (debug_port));
jerry_debugger_init (jerry_port_default_init_socket_transport (debug_port));

register_js_function ("assert", jerryx_handler_assert);
register_js_function ("gc", jerryx_handler_gc);
Expand Down
5 changes: 3 additions & 2 deletions jerry-port/default/default-debugger-transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/

#include "jerryscript-port.h"
#include "jerryscript-port-default.h"
#include "jmem.h"

#ifdef JERRY_DEBUGGER
Expand Down Expand Up @@ -585,7 +586,7 @@ static struct jerry_debugger_transport_t socket_transport =
* @return the transport created
*/
struct jerry_debugger_transport_t *
jerry_port_init_socket_transport (uint16_t tcp_port) /**< server port number */
jerry_port_default_init_socket_transport (uint16_t tcp_port) /**< server port number */
{
#ifdef JERRY_DEBUGGER
debugger_port = tcp_port;
Expand All @@ -594,4 +595,4 @@ jerry_port_init_socket_transport (uint16_t tcp_port) /**< server port number */
JERRY_UNUSED (tcp_port);
return NULL;
#endif /* JERRY_DEBUGGER */
} /* jerry_port_init_socket_transport */
} /* jerry_port_default_init_socket_transport */
6 changes: 6 additions & 0 deletions jerry-port/default/include/jerryscript-port-default.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ void jerry_port_default_set_log_level (jerry_log_level_t level);

void jerry_port_default_set_instance (jerry_instance_t *instance_p);

/**
* The default transport layer that uses TCP socket
* other transports can be added like usb, bluetooth
*/
struct jerry_debugger_transport_t *jerry_port_default_init_socket_transport (uint16_t tcp_port);

/**
* @}
*/
Expand Down
22 changes: 11 additions & 11 deletions targets/nuttx-stm32f4/jerry_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,17 @@ register_js_function (const char *name_p, /**< name of the function */
*/
static jerry_log_level_t jerry_log_level = JERRY_LOG_LEVEL_ERROR;

/**
* Dummy function to return the transport.
*
* @return NULL
*/
jerry_debugger_transport_t *
jerry_port_init_socket_transport (uint16_t tcp_port) /**< server port number */
{
return NULL;
} /* jerry_port_init_socket_transport */

/**
* Main program.
*
Expand Down Expand Up @@ -525,14 +536,3 @@ jerryx_port_handler_print_char (char c) /**< the character to print */
{
printf ("%c", c);
} /* jerryx_port_handler_print_char */

/**
* Dummy function to return the transport.
*
* @return NULL
*/
jerry_debugger_transport_t *
jerry_port_init_socket_transport (uint16_t tcp_port) /**< server port number */
{
return NULL;
} /* jerry_port_init_socket_transport */
21 changes: 10 additions & 11 deletions targets/tizenrt-artik053/apps/jerryscript/jerry_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,16 @@ register_js_function (const char *name_p, /**< name of the function */
*/
static jerry_log_level_t jerry_log_level = JERRY_LOG_LEVEL_ERROR;

/**
* Dummy function to return the transport.
*
* @return NULL
*/
jerry_debugger_transport_t *
jerry_port_init_socket_transport (uint16_t tcp_port) /**< server port number */
{
return NULL;
} /* jerry_port_init_socket_transport */

/**
* JerryScript command main
Expand Down Expand Up @@ -508,17 +518,6 @@ jerryx_port_handler_print_char (char c) /**< the character to print */
printf ("%c", c);
} /* jerryx_port_handler_print_char */

/**
* Dummy function to return the transport.
*
* @return NULL
*/
jerry_debugger_transport_t *
jerry_port_init_socket_transport (uint16_t tcp_port) /**< server port number */
{
return NULL;
} /* jerry_port_init_socket_transport */

/**
* Main program.
*
Expand Down

0 comments on commit 056b7f1

Please sign in to comment.