michaelh/zephyr
1
0
Fork 0
Code Releases Activity

modem: clang-format the modem_socket files

Browse source 
Running clang-format on the modem socket files

Signed-off-by: Wouter Cappelle <wouter.cappelle@crodeon.com>
This commit is contained in:
Wouter Cappelle 2021-10-19 09:24:12 +02:00 • committed by Christopher Friedt
commit 96f9f6e6d2
2 changed files with 23 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

32
drivers/modem/modem_socket.c
View file

@ -19,8 +19,7 @@
* Packet Size Support Functions * Packet Size Support Functions
*/ */
uint16_t modem_socket_next_packet_size(struct modem_socket_config *cfg, uint16_t modem_socket_next_packet_size(struct modem_socket_config *cfg, struct modem_socket *sock)
struct modem_socket *sock)
{ {
uint16_t total = 0U; uint16_t total = 0U;
@ -63,16 +62,15 @@ static int modem_socket_packet_drop_first(struct modem_socket *sock)
sock->packet_count--; sock->packet_count--;
for (i = 0; i < sock->packet_count; i++) { for (i = 0; i < sock->packet_count; i++) {
sock->packet_sizes[i] = sock->packet_sizes[i] = sock->packet_sizes[i + 1];
sock->packet_sizes[i + 1];
} }
sock->packet_sizes[sock->packet_count] = 0U; sock->packet_sizes[sock->packet_count] = 0U;
return 0; return 0;
} }
int modem_socket_packet_size_update(struct modem_socket_config *cfg, int modem_socket_packet_size_update(struct modem_socket_config *cfg, struct modem_socket *sock,
struct modem_socket *sock, int new_total) int new_total)
{ {
uint16_t old_total = 0U; uint16_t old_total = 0U;
@ -139,8 +137,7 @@ data_ready:
* Socket Support Functions * Socket Support Functions
*/ */
int modem_socket_get(struct modem_socket_config *cfg, int modem_socket_get(struct modem_socket_config *cfg, int family, int type, int proto)
int family, int type, int proto)
{ {
int i; int i;
@ -176,8 +173,7 @@ int modem_socket_get(struct modem_socket_config *cfg,
return cfg->sockets[i].sock_fd; return cfg->sockets[i].sock_fd;
} }
struct modem_socket *modem_socket_from_fd(struct modem_socket_config *cfg, struct modem_socket *modem_socket_from_fd(struct modem_socket_config *cfg, int sock_fd)
int sock_fd)
{ {
int i; int i;
@ -195,8 +191,7 @@ struct modem_socket *modem_socket_from_fd(struct modem_socket_config *cfg,
return NULL; return NULL;
} }
struct modem_socket *modem_socket_from_id(struct modem_socket_config *cfg, struct modem_socket *modem_socket_from_id(struct modem_socket_config *cfg, int id)
int id)
{ {
int i; int i;
@ -259,8 +254,8 @@ void modem_socket_put(struct modem_socket_config *cfg, int sock_fd)
* socket it polled. I think we could live with such limitation though in the * socket it polled. I think we could live with such limitation though in the
* initial implementation, but this should be improved in the future. * initial implementation, but this should be improved in the future.
*/ */
int modem_socket_poll(struct modem_socket_config *cfg, int modem_socket_poll(struct modem_socket_config *cfg, struct zsock_pollfd *fds, int nfds,
struct zsock_pollfd *fds, int nfds, int msecs) int msecs)
{ {
struct modem_socket *sock; struct modem_socket *sock;
int ret, i; int ret, i;
@ -341,8 +336,7 @@ int modem_socket_poll(struct modem_socket_config *cfg,
return found_count; return found_count;
} }
void modem_socket_wait_data(struct modem_socket_config *cfg, void modem_socket_wait_data(struct modem_socket_config *cfg, struct modem_socket *sock)
struct modem_socket *sock)
{ {
k_sem_take(&cfg->sem_lock, K_FOREVER); k_sem_take(&cfg->sem_lock, K_FOREVER);
sock->is_waiting = true; sock->is_waiting = true;
@ -351,8 +345,7 @@ void modem_socket_wait_data(struct modem_socket_config *cfg,
k_sem_take(&sock->sem_data_ready, K_FOREVER); k_sem_take(&sock->sem_data_ready, K_FOREVER);
} }
void modem_socket_data_ready(struct modem_socket_config *cfg, void modem_socket_data_ready(struct modem_socket_config *cfg, struct modem_socket *sock)
struct modem_socket *sock)
{ {
k_sem_take(&cfg->sem_lock, K_FOREVER); k_sem_take(&cfg->sem_lock, K_FOREVER);
@ -370,8 +363,7 @@ void modem_socket_data_ready(struct modem_socket_config *cfg,
k_sem_give(&cfg->sem_lock); k_sem_give(&cfg->sem_lock);
} }
int modem_socket_init(struct modem_socket_config *cfg, int modem_socket_init(struct modem_socket_config *cfg, const struct socket_op_vtable *vtable)
const struct socket_op_vtable *vtable)
{ {
int i; int i;

29
drivers/modem/modem_socket.h
View file

@ -62,26 +62,19 @@ struct modem_socket_config {
}; };
/* return size of the first packet */ /* return size of the first packet */
uint16_t modem_socket_next_packet_size(struct modem_socket_config *cfg, uint16_t modem_socket_next_packet_size(struct modem_socket_config *cfg, struct modem_socket *sock);
struct modem_socket *sock); int modem_socket_packet_size_update(struct modem_socket_config *cfg, struct modem_socket *sock,
int modem_socket_packet_size_update(struct modem_socket_config *cfg, int new_total);
struct modem_socket *sock, int new_total); int modem_socket_get(struct modem_socket_config *cfg, int family, int type, int proto);
int modem_socket_get(struct modem_socket_config *cfg, int family, int type, struct modem_socket *modem_socket_from_fd(struct modem_socket_config *cfg, int sock_fd);
int proto); struct modem_socket *modem_socket_from_id(struct modem_socket_config *cfg, int id);
struct modem_socket *modem_socket_from_fd(struct modem_socket_config *cfg,
int sock_fd);
struct modem_socket *modem_socket_from_id(struct modem_socket_config *cfg,
int id);
struct modem_socket *modem_socket_from_newid(struct modem_socket_config *cfg); struct modem_socket *modem_socket_from_newid(struct modem_socket_config *cfg);
void modem_socket_put(struct modem_socket_config *cfg, int sock_fd); void modem_socket_put(struct modem_socket_config *cfg, int sock_fd);
int modem_socket_poll(struct modem_socket_config *cfg, int modem_socket_poll(struct modem_socket_config *cfg, struct zsock_pollfd *fds, int nfds,
struct zsock_pollfd *fds, int nfds, int msecs); int msecs);
void modem_socket_wait_data(struct modem_socket_config *cfg, void modem_socket_wait_data(struct modem_socket_config *cfg, struct modem_socket *sock);
struct modem_socket *sock); void modem_socket_data_ready(struct modem_socket_config *cfg, struct modem_socket *sock);
void modem_socket_data_ready(struct modem_socket_config *cfg, int modem_socket_init(struct modem_socket_config *cfg, const struct socket_op_vtable *vtable);
struct modem_socket *sock);
int modem_socket_init(struct modem_socket_config *cfg,
const struct socket_op_vtable *vtable);
#ifdef __cplusplus #ifdef __cplusplus
} }