Skip to content

Commit c5a5f2b

Browse files
LaszloLangoyichoi
LaszloLango
authored and
yichoi
committed
Build fix after recent commits. (#995)
IoT.js-DCO-1.0-Signed-off-by: László Langó [email protected]
1 parent 3a1a45b commit c5a5f2b

File tree

5 files changed

+26
-34
lines changed

5 files changed

+26
-34
lines changed

‎src/modules/iotjs_module_i2c.c

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ IOTJS_DEFINE_NATIVE_HANDLE_INFO_THIS_MODULE(i2c);
2626

2727

2828
iotjs_i2c_reqwrap_t* iotjs_i2c_reqwrap_create(const iotjs_jval_t* jcallback,
29-
const iotjs_jval_t* ji2c,
30-
I2cOp op) {
29+
iotjs_i2c_t* i2c, I2cOp op) {
3130
iotjs_i2c_reqwrap_t* i2c_reqwrap = IOTJS_ALLOC(iotjs_i2c_reqwrap_t);
3231
IOTJS_VALIDATED_STRUCT_CONSTRUCTOR(iotjs_i2c_reqwrap_t, i2c_reqwrap);
3332

@@ -37,7 +36,7 @@ iotjs_i2c_reqwrap_t* iotjs_i2c_reqwrap_create(const iotjs_jval_t* jcallback,
3736
#if defined(__linux__) || defined(__APPLE__)
3837
_this->req_data.device = iotjs_string_create("");
3938
#endif
40-
_this->i2c_data = iotjs_i2c_instance_from_jval(ji2c);
39+
_this->i2c_data = i2c;
4140
return i2c_reqwrap;
4241
}
4342

@@ -240,7 +239,7 @@ JHANDLER_FUNCTION(I2cCons) {
240239
// Create I2C request wrap
241240
const iotjs_jval_t* jcallback = JHANDLER_GET_ARG(1, function);
242241
iotjs_i2c_reqwrap_t* req_wrap =
243-
iotjs_i2c_reqwrap_create(jcallback, ji2c, kI2cOpOpen);
242+
iotjs_i2c_reqwrap_create(jcallback, i2c, kI2cOpOpen);
244243

245244
iotjs_i2c_reqdata_t* req_data = iotjs_i2c_reqwrap_data(req_wrap);
246245
#if defined(__linux__) || defined(__APPLE__)
@@ -255,7 +254,7 @@ JHANDLER_FUNCTION(I2cCons) {
255254

256255

257256
JHANDLER_FUNCTION(SetAddress) {
258-
JHANDLER_DECLARE_THIS_PTR(i2c_reqwrap, i2c);
257+
JHANDLER_DECLARE_THIS_PTR(i2c, i2c);
259258
DJHANDLER_CHECK_ARGS(1, number);
260259

261260
I2cSetAddress(i2c, JHANDLER_GET_ARG(0, number));
@@ -265,7 +264,7 @@ JHANDLER_FUNCTION(SetAddress) {
265264

266265

267266
JHANDLER_FUNCTION(Close) {
268-
JHANDLER_DECLARE_THIS_PTR(i2c_reqwrap, i2c);
267+
JHANDLER_DECLARE_THIS_PTR(i2c, i2c);
269268
DJHANDLER_CHECK_ARGS(0);
270269

271270
I2cClose(i2c);
@@ -275,14 +274,13 @@ JHANDLER_FUNCTION(Close) {
275274

276275

277276
JHANDLER_FUNCTION(Write) {
278-
JHANDLER_DECLARE_THIS_PTR(i2c_reqwrap, i2c);
277+
JHANDLER_DECLARE_THIS_PTR(i2c, i2c);
279278
DJHANDLER_CHECK_ARGS(2, array, function);
280279

281280
const iotjs_jval_t* jcallback = JHANDLER_GET_ARG(1, function);
282-
const iotjs_jval_t* ji2c = iotjs_jobjectwrap_jobject(i2c);
283281

284282
iotjs_i2c_reqwrap_t* req_wrap =
285-
iotjs_i2c_reqwrap_create(jcallback, ji2c, kI2cOpWrite);
283+
iotjs_i2c_reqwrap_create(jcallback, i2c, kI2cOpWrite);
286284
iotjs_i2c_reqdata_t* req_data = iotjs_i2c_reqwrap_data(req_wrap);
287285

288286
GetI2cArray(JHANDLER_GET_ARG(0, array), req_data);
@@ -294,14 +292,13 @@ JHANDLER_FUNCTION(Write) {
294292

295293

296294
JHANDLER_FUNCTION(Read) {
297-
JHANDLER_DECLARE_THIS_PTR(i2c_reqwrap, i2c);
295+
JHANDLER_DECLARE_THIS_PTR(i2c, i2c);
298296
DJHANDLER_CHECK_ARGS(2, number, function);
299297

300298
const iotjs_jval_t* jcallback = JHANDLER_GET_ARG(1, function);
301-
const iotjs_jval_t* ji2c = iotjs_jobjectwrap_jobject(i2c);
302299

303300
iotjs_i2c_reqwrap_t* req_wrap =
304-
iotjs_i2c_reqwrap_create(jcallback, ji2c, kI2cOpRead);
301+
iotjs_i2c_reqwrap_create(jcallback, i2c, kI2cOpRead);
305302

306303
iotjs_i2c_reqdata_t* req_data = iotjs_i2c_reqwrap_data(req_wrap);
307304
req_data->buf_len = JHANDLER_GET_ARG(0, number);

‎src/modules/iotjs_module_i2c.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ iotjs_i2c_t* iotjs_i2c_instance_from_jval(const iotjs_jval_t* ji2c);
8484

8585
#define THIS iotjs_i2c_reqwrap_t* i2c_reqwrap
8686
iotjs_i2c_reqwrap_t* iotjs_i2c_reqwrap_create(const iotjs_jval_t* jcallback,
87-
const iotjs_jval_t* ji2c,
88-
I2cOp op);
87+
iotjs_i2c_t* i2c, I2cOp op);
8988
void iotjs_i2c_reqwrap_dispatched(THIS);
9089
uv_work_t* iotjs_i2c_reqwrap_req(THIS);
9190
const iotjs_jval_t* iotjs_i2c_reqwrap_jcallback(THIS);

‎src/modules/iotjs_module_pwm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static void iotjs_pwm_destroy(iotjs_pwm_t* pwm) {
5151

5252

5353
static iotjs_pwm_reqwrap_t* iotjs_pwm_reqwrap_create(
54-
const iotjs_jval_t* jcallback, const iotjs_pwm_t* pwm, PwmOp op) {
54+
const iotjs_jval_t* jcallback, iotjs_pwm_t* pwm, PwmOp op) {
5555
iotjs_pwm_reqwrap_t* pwm_reqwrap = IOTJS_ALLOC(iotjs_pwm_reqwrap_t);
5656
IOTJS_VALIDATED_STRUCT_CONSTRUCTOR(iotjs_pwm_reqwrap_t, pwm_reqwrap);
5757

‎src/modules/iotjs_module_spi.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
#include <unistd.h>
2121

2222

23-
/*
24-
* SPI instance function
25-
*/
26-
static iotjs_spi_t* iotjs_spi_instance_from_jval(const iotjs_jval_t* jspi);
27-
2823
IOTJS_DEFINE_NATIVE_HANDLE_INFO_THIS_MODULE(spi);
2924

3025
static iotjs_spi_t* iotjs_spi_create(const iotjs_jval_t* jspi) {
@@ -51,7 +46,7 @@ static void iotjs_spi_destroy(iotjs_spi_t* spi) {
5146

5247

5348
static iotjs_spi_reqwrap_t* iotjs_spi_reqwrap_create(
54-
const iotjs_jval_t* jcallback, const iotjs_spi_t* spi, SpiOp op) {
49+
const iotjs_jval_t* jcallback, iotjs_spi_t* spi, SpiOp op) {
5550
iotjs_spi_reqwrap_t* spi_reqwrap = IOTJS_ALLOC(iotjs_spi_reqwrap_t);
5651
IOTJS_VALIDATED_STRUCT_CONSTRUCTOR(iotjs_spi_reqwrap_t, spi_reqwrap);
5752

@@ -89,12 +84,6 @@ static const iotjs_jval_t* iotjs_spi_reqwrap_jcallback(THIS) {
8984
}
9085

9186

92-
static iotjs_spi_t* iotjs_spi_instance_from_jval(const iotjs_jval_t* jspi) {
93-
uintptr_t handle = iotjs_jval_get_object_native_handle(jspi);
94-
return (iotjs_spi_t*)handle;
95-
}
96-
97-
9887
iotjs_spi_reqwrap_t* iotjs_spi_reqwrap_from_request(uv_work_t* req) {
9988
return (iotjs_spi_reqwrap_t*)(iotjs_reqwrap_from_request((uv_req_t*)req));
10089
}

‎src/modules/iotjs_module_uart.c

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,26 @@ static iotjs_uart_t* iotjs_uart_create(const iotjs_jval_t* juart) {
3434
return uart;
3535
}
3636

37+
static void iotjs_uart_destroy(iotjs_uart_t* uart) {
38+
IOTJS_VALIDATED_STRUCT_DESTRUCTOR(iotjs_uart_t, uart);
39+
iotjs_jobjectwrap_destroy(&_this->jobjectwrap);
40+
iotjs_string_destroy(&_this->device_path);
41+
IOTJS_RELEASE(uart);
42+
}
43+
3744

3845
#define THIS iotjs_uart_reqwrap_t* uart_reqwrap
3946

4047

4148
static iotjs_uart_reqwrap_t* iotjs_uart_reqwrap_create(
42-
const iotjs_jval_t* jcallback, const iotjs_jval_t* juart, UartOp op) {
49+
const iotjs_jval_t* jcallback, iotjs_uart_t* uart, UartOp op) {
4350
iotjs_uart_reqwrap_t* uart_reqwrap = IOTJS_ALLOC(iotjs_uart_reqwrap_t);
4451
IOTJS_VALIDATED_STRUCT_CONSTRUCTOR(iotjs_uart_reqwrap_t, uart_reqwrap);
4552

4653
iotjs_reqwrap_initialize(&_this->reqwrap, jcallback, (uv_req_t*)&_this->req);
4754

4855
_this->req_data.op = op;
49-
_this->uart_instance = iotjs_uart_instance_from_jval(juart);
56+
_this->uart_instance = uart;
5057

5158
return uart_reqwrap;
5259
}
@@ -232,11 +239,11 @@ void iotjs_uart_read_cb(uv_poll_t* req, int status, int events) {
232239
}
233240

234241

235-
#define UART_ASYNC(call, jthis, jcallback, op) \
242+
#define UART_ASYNC(call, this, jcallback, op) \
236243
do { \
237244
uv_loop_t* loop = iotjs_environment_loop(iotjs_environment_get()); \
238245
iotjs_uart_reqwrap_t* req_wrap = \
239-
iotjs_uart_reqwrap_create(jcallback, jthis, op); \
246+
iotjs_uart_reqwrap_create(jcallback, this, op); \
240247
uv_work_t* req = iotjs_uart_reqwrap_req(req_wrap); \
241248
uv_queue_work(loop, req, iotjs_uart_##call##_worker, \
242249
iotjs_uart_after_worker); \
@@ -278,7 +285,7 @@ JHANDLER_FUNCTION(UartConstructor) {
278285
iotjs_jval_destroy(&jbaud_rate);
279286
iotjs_jval_destroy(&jdata_bits);
280287

281-
UART_ASYNC(open, juart, jcallback, kUartOpOpen);
288+
UART_ASYNC(open, uart, jcallback, kUartOpOpen);
282289
}
283290

284291

@@ -295,7 +302,7 @@ JHANDLER_FUNCTION(Write) {
295302
_this->buf_len = iotjs_string_size(&_this->buf_data);
296303

297304
if (jcallback) {
298-
UART_ASYNC(write, juart, jcallback, kUartOpWrite);
305+
UART_ASYNC(write, uart, jcallback, kUartOpWrite);
299306
} else {
300307
bool result = iotjs_uart_write(uart);
301308
iotjs_string_destroy(&_this->buf_data);
@@ -320,7 +327,7 @@ JHANDLER_FUNCTION(Close) {
320327
iotjs_jval_destroy(&_this->jemitter_this);
321328

322329
if (jcallback) {
323-
UART_ASYNC(close, juart, jcallback, kUartOpClose);
330+
UART_ASYNC(close, uart, jcallback, kUartOpClose);
324331
} else {
325332
if (!iotjs_uart_close(uart)) {
326333
JHANDLER_THROW(COMMON, "UART Close Error");

0 commit comments

Comments
 (0)