theater/picomap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename screaming case symbols to snake_case in w6300 public API

Browse Source
This commit is contained in:
Ian Gulliver
2026-04-07 07:09:11 +09:00
parent 843a286631
commit 3c320cf466
2 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
firmware/w6300/w6300.cpp
View File

@@ -260,7 +260,7 @@ constexpr uint8_t PACK_COMPLETED = static_cast<uint8_t>(pack_info::completed);
constexpr uint8_t PACK_IPv6 = static_cast<uint8_t>(pack_info::ipv6);
enum sockint_kind { SIK_CONNECTED = 1, SIK_DISCONNECTED = 2, SIK_RECEIVED = 4, SIK_TIMEOUT = 8, SIK_SENT = 16, SIK_ALL = 0x1F };
enum sockint_kind { sik_connected = 1, sik_disconnected = 2, sik_received = 4, sik_timeout = 8, sik_sent = 16, sik_all = 0x1F };
constexpr uint8_t TCPSOCK_MODE = static_cast<uint8_t>(tcp_sock_info::mode);
@@ -959,19 +959,19 @@ int8_t init_buffers(std::span<const uint8_t> txsize, std::span<const uint8_t> rx
soft_reset();
if (!txsize.empty()) {
int8_t tmp = 0;
for (int i = 0; i < SOCK_COUNT; i++) {
for (int i = 0; i < sock_count; i++) {
tmp += txsize[i];
if (tmp > 32) return -1;
}
for (int i = 0; i < SOCK_COUNT; i++) set_sn_txbuf_size(i, txsize[i]);
for (int i = 0; i < sock_count; i++) set_sn_txbuf_size(i, txsize[i]);
}
if (!rxsize.empty()) {
int8_t tmp = 0;
for (int i = 0; i < SOCK_COUNT; i++) {
for (int i = 0; i < sock_count; i++) {
tmp += rxsize[i];
if (tmp > 32) return -1;
}
for (int i = 0; i < SOCK_COUNT; i++) set_sn_rxbuf_size(i, rxsize[i]);
for (int i = 0; i < sock_count; i++) set_sn_rxbuf_size(i, rxsize[i]);
}
return 0;
}
@@ -979,7 +979,7 @@ int8_t init_buffers(std::span<const uint8_t> txsize, std::span<const uint8_t> rx
void clear_interrupt(intr_kind intr) {
set_irclr((uint8_t)intr);
uint8_t sir = (uint8_t)((uint16_t)intr >> 8);
for (int i = 0; i < SOCK_COUNT; i++)
for (int i = 0; i < sock_count; i++)
if (sir & (1 << i)) set_sn_irclr(i, 0xFF);
set_slirclr((uint8_t)((uint32_t)intr >> 16));
}
@@ -1179,11 +1179,11 @@ constexpr uint16_t SOCK_ANY_PORT_NUM = 0xC000;
static uint16_t sock_any_port = SOCK_ANY_PORT_NUM;
static uint16_t sock_io_mode_bits = 0;
static uint16_t sock_is_sending = 0;
static uint16_t sock_remained_size[SOCK_COUNT] = {0,};
uint8_t sock_pack_info[SOCK_COUNT] = {0,};
static uint16_t sock_remained_size[sock_count] = {0,};
uint8_t sock_pack_info[sock_count] = {0,};
#define FAIL(e) return std::unexpected(sock_error::e)
#define CHECK_SOCKNUM() do { if(sn >= SOCK_COUNT) FAIL(sock_num); } while(0)
#define CHECK_SOCKNUM() do { if(sn >= sock_count) FAIL(sock_num); } while(0)
#define CHECK_SOCKMODE(mode) do { if((get_sn_mr(sn) & 0x0F) != mode) FAIL(sock_mode); } while(0)
#define CHECK_TCPMODE() do { if((get_sn_mr(sn) & 0x03) != 0x01) FAIL(sock_mode); } while(0)
#define CHECK_UDPMODE() do { if((get_sn_mr(sn) & 0x03) != 0x02) FAIL(sock_mode); } while(0)
@@ -1649,7 +1649,7 @@ void init_net(const net_info& info) {
std::expected<void, sock_error> set_socket_io_mode(socket_id sid, sock_io_mode mode) {
uint8_t sn = static_cast<uint8_t>(sid);
if (sn >= SOCK_COUNT) FAIL(sock_num);
if (sn >= sock_count) FAIL(sock_num);
if (mode == sock_io_mode::nonblock) sock_io_mode_bits |= (1 << sn);
else if (mode == sock_io_mode::block) sock_io_mode_bits &= ~(1 << sn);
else FAIL(arg);
@@ -1671,8 +1671,8 @@ uint16_t get_socket_max_rx(socket_id sid) {
std::expected<void, sock_error> clear_socket_interrupt(socket_id sid, uint8_t flags) {
uint8_t sn = static_cast<uint8_t>(sid);
if (sn >= SOCK_COUNT) FAIL(sock_num);
if (flags > SIK_ALL) FAIL(arg);
if (sn >= sock_count) FAIL(sock_num);
if (flags > sik_all) FAIL(arg);
set_sn_ir(sn, flags);
return {};
}
@@ -1683,8 +1683,8 @@ uint8_t get_socket_interrupt(socket_id sid) {
std::expected<void, sock_error> set_socket_interrupt_mask(socket_id sid, uint8_t mask) {
uint8_t sn = static_cast<uint8_t>(sid);
if (sn >= SOCK_COUNT) FAIL(sock_num);
if (mask > SIK_ALL) FAIL(arg);
if (sn >= sock_count) FAIL(sock_num);
if (mask > sik_all) FAIL(arg);
set_sn_imr(sn, mask);
return {};
}
@@ -1695,7 +1695,7 @@ uint8_t get_socket_interrupt_mask(socket_id sid) {
std::expected<void, sock_error> set_socket_prefer(socket_id sid, srcv6_prefer pref) {
uint8_t sn = static_cast<uint8_t>(sid);
if (sn >= SOCK_COUNT) FAIL(sock_num);
if (sn >= sock_count) FAIL(sock_num);
uint8_t v = static_cast<uint8_t>(pref);
if ((v & 0x03) == 0x01) FAIL(arg);
set_sn_psr(sn, v);