[jerryscript] Update JerryScript to latest master (#855)

Rebased code to remove compile warnings

Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>

27 files changed, 30 insertions, 30 deletions

diff --git a/deps/jerryscript b/deps/jerryscript
-Subproject 8b5d645df65e54a4ffe4e37a323d1eb68a45a79
+Subproject 4420401cf5c7810a8c5c9404e6921d88d30c16a
diff --git a/src/main.c b/src/main.c
index 5a699e3..2a91069 100644
--- a/src/main.c
+++ b/src/main.c
@@ -12,7 +12,7 @@
 #include "zjs_util.h"
 
 // JerryScript includes
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 // Platform agnostic modules/headers
 #include "zjs_callbacks.h"
@@ -41,8 +41,8 @@
 #define ZJS_MAX_PRINT_SIZE      512
 
 #ifdef ZJS_SNAPSHOT_BUILD
-extern const uint8_t snapshot_bytecode[];
-extern const int snapshot_len;
+extern const uint32_t snapshot_bytecode[];
+extern const size_t snapshot_len;
 #else
 extern const char *script_gen;
 #endif
diff --git a/src/snapshot.c b/src/snapshot.c
index 526fc30..63a3d51 100644
--- a/src/snapshot.c
+++ b/src/snapshot.c
@@ -4,12 +4,12 @@
 #include "zjs_script.h"
 
 // JerryScript includes
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 #define SNAPSHOT_BUFFER_SIZE 51200
 #define SNAPSHOT_SOURCE_FILE "src/zjs_snapshot_gen.c"
 
-static uint8_t snapshot_buf[SNAPSHOT_BUFFER_SIZE];
+static uint32_t snapshot_buf[SNAPSHOT_BUFFER_SIZE];
 
 static int generate_snapshot(const char *file_name, uint8_t *buf, int buf_size)
 {
@@ -24,7 +24,7 @@ static int generate_snapshot(const char *file_name, uint8_t *buf, int buf_size)
 
     fwrite("/* This file was auto-generated */\n\n", 1, 36, f);
     fwrite("#include \"zjs_common.h\"\n\n", 1, 25, f);
-    fwrite("const uint8_t snapshot_bytecode[] = {\n", 1, 38, f);
+    fwrite("const uint32_t snapshot_bytecode[] = {\n", 1, 38, f);
 
     for (int i = 0; i < buf_size; i++)
     {
diff --git a/src/zjs_a101_pins.h b/src/zjs_a101_pins.h
index 22e9306..d6a8ef8 100644
--- a/src/zjs_a101_pins.h
+++ b/src/zjs_a101_pins.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_a101_pins_h__
 #define __zjs_a101_pins_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 jerry_value_t zjs_a101_init();
 
diff --git a/src/zjs_aio.h b/src/zjs_aio.h
index 513834e..26da242 100644
--- a/src/zjs_aio.h
+++ b/src/zjs_aio.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_aio_h__
 #define __zjs_aio_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 /** Initialize the aio module, or reinitialize after cleanup */
 jerry_value_t zjs_aio_init();
diff --git a/src/zjs_ble.h b/src/zjs_ble.h
index efff03c..0a1d81c 100644
--- a/src/zjs_ble.h
+++ b/src/zjs_ble.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_ble_h__
 #define __zjs_ble_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 /**
  * Initialize the ble module, or reinitialize after cleanup
diff --git a/src/zjs_buffer.c b/src/zjs_buffer.c
index a129738..7cf6001 100644
--- a/src/zjs_buffer.c
+++ b/src/zjs_buffer.c
@@ -5,7 +5,7 @@
 #include <string.h>
 
 // JerryScript includes
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 // ZJS includes
 #include "zjs_util.h"
diff --git a/src/zjs_buffer.h b/src/zjs_buffer.h
index 052ac2a..27716f5 100644
--- a/src/zjs_buffer.h
+++ b/src/zjs_buffer.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_buffer_h__
 #define __zjs_buffer_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 /** Initialize the buffer module, or reinitialize after cleanup */
 void zjs_buffer_init();
diff --git a/src/zjs_callbacks.c b/src/zjs_callbacks.c
index 156ad43..f24b751 100644
--- a/src/zjs_callbacks.c
+++ b/src/zjs_callbacks.c
@@ -12,7 +12,7 @@
 #include "zjs_util.h"
 #include "zjs_callbacks.h"
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 // this could be defined with config options in the future
 #ifndef ZJS_CALLBACK_BUF_SIZE
diff --git a/src/zjs_callbacks.h b/src/zjs_callbacks.h
index b7f6cd8..dfd82c0 100644
--- a/src/zjs_callbacks.h
+++ b/src/zjs_callbacks.h
@@ -3,7 +3,7 @@
 #ifndef SRC_ZJS_CALLBACKS_H_
 #define SRC_ZJS_CALLBACKS_H_
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 typedef int16_t zjs_callback_id;
 
diff --git a/src/zjs_dgram.h b/src/zjs_dgram.h
index ed985a4..1424e74 100644
--- a/src/zjs_dgram.h
+++ b/src/zjs_dgram.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_dgram_h__
 #define __zjs_dgram_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 /** Initialize the dgram module, or reinitialize after cleanup */
 jerry_value_t zjs_dgram_init();
diff --git a/src/zjs_error.h b/src/zjs_error.h
index a6aea74..762b506 100644
--- a/src/zjs_error.h
+++ b/src/zjs_error.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_error_h__
 #define __zjs_error_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 typedef enum zjs_error_type {
     NetworkError,
diff --git a/src/zjs_gpio.h b/src/zjs_gpio.h
index 814723b..f4c932f 100644
--- a/src/zjs_gpio.h
+++ b/src/zjs_gpio.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_gpio_h__
 #define __zjs_gpio_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 extern void (*zjs_gpio_convert_pin)(uint32_t orig, int *dev, int *pin);
 
diff --git a/src/zjs_grove_lcd.h b/src/zjs_grove_lcd.h
index 07815d8..f2607fe 100644
--- a/src/zjs_grove_lcd.h
+++ b/src/zjs_grove_lcd.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_grove_lcd_h__
 #define __zjs_grove_lcd_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 jerry_value_t zjs_grove_lcd_init();
 
diff --git a/src/zjs_i2c.h b/src/zjs_i2c.h
index bc8577f..946e682 100644
--- a/src/zjs_i2c.h
+++ b/src/zjs_i2c.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_i2c_h__
 #define __zjs_i2c_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 /**
  * Initialize the i2c module, or reinitialize after cleanup
diff --git a/src/zjs_k64f_pins.h b/src/zjs_k64f_pins.h
index 41b85f6..4a425ca 100644
--- a/src/zjs_k64f_pins.h
+++ b/src/zjs_k64f_pins.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_k64f_pins_h__
 #define __zjs_k64f_pins_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 jerry_value_t zjs_k64f_init();
 
diff --git a/src/zjs_modules.h b/src/zjs_modules.h
index b49b3af..0d85515 100644
--- a/src/zjs_modules.h
+++ b/src/zjs_modules.h
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #endif
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 #define NUM_SERVICE_ROUTINES 3
 
diff --git a/src/zjs_ocf_client.c b/src/zjs_ocf_client.c
index c873922..45a1275 100644
--- a/src/zjs_ocf_client.c
+++ b/src/zjs_ocf_client.c
@@ -2,7 +2,7 @@
 
 #ifdef BUILD_MODULE_OCF
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 #include "zjs_util.h"
 #include "zjs_common.h"
diff --git a/src/zjs_ocf_client.h b/src/zjs_ocf_client.h
index 0ac1ac0..2a98431 100644
--- a/src/zjs_ocf_client.h
+++ b/src/zjs_ocf_client.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_ocf_client__
 #define __zjs_ocf_client__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 /*
  * Initialize the OCF client object
diff --git a/src/zjs_ocf_common.c b/src/zjs_ocf_common.c
index f4d715b..2243de5 100644
--- a/src/zjs_ocf_common.c
+++ b/src/zjs_ocf_common.c
@@ -2,7 +2,7 @@
 
 #ifdef BUILD_MODULE_OCF
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 #include "zjs_util.h"
 #include "zjs_common.h"
diff --git a/src/zjs_ocf_common.h b/src/zjs_ocf_common.h
index 65b7f83..b2173e6 100644
--- a/src/zjs_ocf_common.h
+++ b/src/zjs_ocf_common.h
@@ -1,6 +1,6 @@
 // Copyright (c) 2016, Intel Corporation.
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 #include "zjs_common.h"
 #include "zjs_ocf_client.h"
diff --git a/src/zjs_performance.h b/src/zjs_performance.h
index 6d1b0a0..d839fb3 100644
--- a/src/zjs_performance.h
+++ b/src/zjs_performance.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_performance_h__
 #define __zjs_performance_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 jerry_value_t zjs_performance_init();
 
diff --git a/src/zjs_pwm.h b/src/zjs_pwm.h
index e020cd5..82cc8f9 100644
--- a/src/zjs_pwm.h
+++ b/src/zjs_pwm.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_pwm_h__
 #define __zjs_pwm_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 extern void (*zjs_pwm_convert_pin)(uint32_t num, int *dev, int *pin);
 
diff --git a/src/zjs_sensor.h b/src/zjs_sensor.h
index 7b3d630..5034c57 100644
--- a/src/zjs_sensor.h
+++ b/src/zjs_sensor.h
@@ -3,7 +3,7 @@
 #ifndef __zjs_sensor_h__
 #define __zjs_sensor_h__
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 /** Initialize the sensor module, or reinitialize after cleanup */
 void zjs_sensor_init();
diff --git a/src/zjs_timers.c b/src/zjs_timers.c
index cfbc49c..4c844b6 100644
--- a/src/zjs_timers.c
+++ b/src/zjs_timers.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 // JerryScript includes
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 // ZJS includes
 #include "zjs_util.h"
diff --git a/src/zjs_uart.h b/src/zjs_uart.h
index 94de146..ac41385 100644
--- a/src/zjs_uart.h
+++ b/src/zjs_uart.h
@@ -3,7 +3,7 @@
 #ifndef SRC_ZJS_UART_H_
 #define SRC_ZJS_UART_H_
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 
 /** Initialize the uart module, or reinitialize after cleanup */
  jerry_value_t zjs_uart_init();
diff --git a/src/zjs_util.h b/src/zjs_util.h
index e346af0..4277890 100644
--- a/src/zjs_util.h
+++ b/src/zjs_util.h
@@ -7,7 +7,7 @@
 
 #include <stdlib.h>
 
-#include "jerry-api.h"
+#include "jerryscript.h"
 #include "zjs_common.h"
 #include "zjs_error.h"