8000 Merge pull request #7247 from tannewt/picow_web_workflow · netroy/circuitpython@ad2d190 · GitHub
[go: up one dir, main page]
Skip to content

Commit ad2d190

Browse files
tannewttannewt
authored
Merge pull request adafruit#7247 from tannewt/picow_web_workflow
Enable* web workflow for Pico W
2 parents 6457827 + 167a506 commit ad2d190

File tree

33 files changed

+342
-574
lines changed

33 files changed

+342
-574
lines changed

‎ports/atmel-samd/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ SRC_C += \
293293
boards/$(BOARD)/board.c \
294294
boards/$(BOARD)/pins.c \
295295
eic_handler.c \
296-
fatfs_port.c \
297296
lib/tinyusb/src/portable/microchip/samd/dcd_samd.c \
298297
mphalport.c \
299298
reset.c \

‎ports/atmel-samd/fatfs_port.c

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎ports/broadcom/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ SRC_C += bindings/videocore/__init__.c \
5858
boards/$(BOARD)/pins.c \
5959
background.c \
6060
common-hal/videocore/Framebuffer.c \
61-
fatfs_port.c \
6261
mphalport.c \
6362
lib/sdmmc/sdmmc_cmd.c \
6463
lib/sdmmc/sdmmc_common.c \

‎ports/broadcom/fatfs_port.c

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎ports/cxd56/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ SRC_S = supervisor/cpu.s
140140

141141
SRC_C += \
142142
background.c \
143-
fatfs_port.c \
144143
mphalport.c \
145144
boards/$(BOARD)/board.c \
146145
boards/$(BOARD)/pins.c \

‎ports/cxd56/fatfs_port.c

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎ports/espressif/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ endif
215215

216216
SRC_C += \
217217
background.c \
218-
fatfs_port.c \
219218
mphalport.c \
220219
bindings/espidf/__init__.c \
221220
boards/$(BOARD)/board.c \

‎ports/espressif/common-hal/socketpool/Socket.c

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_
240240
return sock;
241241
}
242242

243-
int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port) {
243+
int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_t *port, socketpool_socket_obj_t *accepted) {
244244
struct sockaddr_in accept_addr;
245245
socklen_t socklen = sizeof(accept_addr);
246246
int newsoc = -1;
@@ -274,12 +274,25 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, uint8_t *ip, uint32_
274274
lwip_close(newsoc);
275275
return -MP_EBADF;
276276
}
277+
278+
279+
if (accepted != NULL) {
280+
// Close the active socket because we have another we accepted.
281+
if (!common_hal_socketpool_socket_get_closed(accepted)) {
282+
common_hal_socketpool_socket_close(accepted);
283+
}
284+
// Create the socket
285+
accepted->num = newsoc;
286+
accepted->pool = self->pool;
287+
accepted->connected = true;
288+
}
289+
277290
return newsoc;
278291
}
279292

280293
socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *self,
281294
uint8_t *ip, uint32_t *port) {
282-
int newsoc = socketpool_socket_accept(self, ip, port);
295+
int newsoc = socketpool_socket_accept(self, ip, port, NULL);
283296

284297
if (newsoc > 0) {
285298
mark_user_socket(newsoc);
@@ -554,6 +567,15 @@ void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t *self, uint
554567
self->timeout_ms = timeout_ms;
555568
}
556569

570+
571+
int common_hal_socketpool_socket_setsockopt(socketpool_socket_obj_t *self, int level, int optname, const void *value, size_t optlen) {
572+
int err = lwip_setsockopt(self->num, level, optname, value, optlen);
573+
if (err != 0) {
574+
return -errno;
575+
}
576+
return 0;
577+
}
578+
557579
bool common_hal_socketpool_readable(socketpool_socket_obj_t *self) {
558580
struct timeval immediate = {0, 0};
559581

@@ -577,3 +599,18 @@ bool common_hal_socketpool_writable(socketpool_socket_obj_t *self) {
577599
// including returning true in the error case
578600
return num_triggered != 0;
579601
}
602+
603+
void socketpool_socket_move(socketpool_socket_obj_t *self, socketpool_socket_obj_t *sock) {
604+
*sock = *self;
605+
self->connected = false;
606+
self->num = -1;
607+
}
608+
609+
void socketpool_socket_reset(socketpool_socket_obj_t *self) {
610+
if (self->base.type == &socketpool_socket_type) {
611+
return;
612+
}
613+
self->base.type = &socketpool_socket_type;
614+
self->connected = false;
615+
self->num = -1;
616+
}

‎ports/espressif/fatfs_port.c

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎ports/litex/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_VALENTYUSB_EPTRI -DCFG_TUD_CDC_RX_BUFSIZE=1024
8787

8888
SRC_C += \
8989
background.c \
90-
fatfs_port.c \
9190
mphalport.c \
9291
boards/$(BOARD)/board.c \
9392
boards/$(BOARD)/pins.c

‎ports/litex/fatfs_port.c

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎ports/mimxrt10xx/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ SRC_C += \
121121
boards/$(BOARD)/board.c \
122122
boards/$(BOARD)/flash_config.c \
123123
boards/$(BOARD)/pins.c \
124-
fatfs_port.c \
125124
lib/tinyusb/src/portable/chipidea/ci_hs/dcd_ci_hs.c \
126125
mphalport.c \
127126
peripherals/mimxrt10xx/$(CHIP_FAMILY)/clocks.c \

‎ports/mimxrt10xx/fatfs_port.c

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0