esp32/network_ppp.c: Update callback signature.

IhorNehrutsa · DvdGiessen · IhorNehrutsa · commit f312daaba34f · 2025-01-23T10:33:19.000+02:00
Signed-off-by: IhorNehrutsa &lt;Ihor.Nehrutsa@gmail.com&gt;

Co-Authored-By: Daniel van de Giessen &lt;daniel@dvdgiessen.nl&gt;
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
@@ -100,7 +100,13 @@ static mp_obj_t ppp_make_new(mp_obj_t stream) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(esp_network_ppp_make_new_obj, ppp_make_new);
 
-static u32_t ppp_output_callback(ppp_pcb *pcb, u8_t *data, u32_t len, void *ctx) {
+
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+static u32_t ppp_output_callback(ppp_pcb *pcb, const void *data, u32_t len, void *ctx)
+#else
+static u32_t ppp_output_callback(ppp_pcb *pcb, u8_t *data, u32_t len, void *ctx)
+#endif
+{
     ppp_if_obj_t *self = ctx;
 
     mp_obj_t stream = self->stream;
@@ -109,7 +115,7 @@ static u32_t ppp_output_callback(ppp_pcb *pcb, u8_t *data, u32_t len, void *ctx)
     }
 
     int err;
-    return mp_stream_rw(stream, data, len, &err, MP_STREAM_RW_WRITE);
+    return mp_stream_rw(stream, (void *)data, len, &err, MP_STREAM_RW_WRITE);
 }
 
 static void pppos_client_task(void *self_in) {

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,13 @@ static mp_obj_t ppp_make_new(mp_obj_t stream) {`
`100`	`100`	`}`
`101`	`101`	`MP_DEFINE_CONST_FUN_OBJ_1(esp_network_ppp_make_new_obj, ppp_make_new);`
`102`	`102`
`103`		`-static u32_t ppp_output_callback(ppp_pcb pcb, u8_t data, u32_t len, void *ctx) {`
	`103`	`+`
	`104`	`+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)`
	`105`	`+static u32_t ppp_output_callback(ppp_pcb pcb, const void data, u32_t len, void *ctx)`
	`106`	`+#else`
	`107`	`+static u32_t ppp_output_callback(ppp_pcb pcb, u8_t data, u32_t len, void *ctx)`
	`108`	`+#endif`
	`109`	`+{`
`104`	`110`	`ppp_if_obj_t *self = ctx;`
`105`	`111`
`106`	`112`	`mp_obj_t stream = self->stream;`
`@@ -109,7 +115,7 @@ static u32_t ppp_output_callback(ppp_pcb pcb, u8_t data, u32_t len, void *ctx)`
`109`	`115`	`}`
`110`	`116`
`111`	`117`	`int err;`
`112`		`- return mp_stream_rw(stream, data, len, &err, MP_STREAM_RW_WRITE);`
	`118`	`+ return mp_stream_rw(stream, (void *)data, len, &err, MP_STREAM_RW_WRITE);`
`113`	`119`	`}`
`114`	`120`
`115`	`121`	`static void pppos_client_task(void *self_in) {`