fef/ardix
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanup and fix warnings

Browse source
This commit is contained in:
Felix Kopp 2021-01-05 17:50:46 +01:00
parent 63ccd87112
commit 5555a3d56d
No known key found for this signature in database
GPG key ID: C478BA0A85F75728
5 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/at91sam3x8e/entry.c
View file

@ -9,7 +9,6 @@
#include <errno.h> #include <errno.h>
#include <stddef.h> #include <stddef.h>
#include <unistd.h>
void arch_enter(void *sp) void arch_enter(void *sp)
{ {
@ -20,13 +19,13 @@ void arch_enter(void *sp)
int sc_ret; int sc_ret;
if (sc_num > NSYSCALLS) { if (sc_num > NSYSCALLS) {
arch_syscall_set_rval(regs, -EINVAL); arch_syscall_set_rval(regs, -ENOSYS);
return; return;
} }
handler = sys_table[sc_num]; handler = sys_table[sc_num];
if (handler == NULL) { if (handler == NULL) {
arch_syscall_set_rval(regs, -EINVAL); arch_syscall_set_rval(regs, -ENOSYS);
return; return;
} }

3
arch/at91sam3x8e/serial.c
View file

@ -21,7 +21,6 @@ struct arch_serial_interface arch_serial_default_interface = {
.tx_current = NULL, .tx_current = NULL,
.tx_next = NULL, .tx_next = NULL,
.interface = { .interface = {
.tx = NULL,
.rx = NULL, .rx = NULL,
.id = 0, .id = 0,
.baud = 0, .baud = 0,
@ -31,8 +30,6 @@ struct serial_interface *serial_default_interface = &arch_serial_default_interfa
int arch_serial_init(struct serial_interface *interface) int arch_serial_init(struct serial_interface *interface)
{ {
struct arch_serial_interface *arch_iface = to_arch_serial_interface(interface);
if (interface->baud <= 0 || interface->id != 0) if (interface->baud <= 0 || interface->id != 0)
return -1; return -1;

2
include/arch/at91sam3x8e/hardware.h
View file

@ -62,7 +62,7 @@ struct reg_snapshot {
#define arch_syscall_arg5(reg_snap) ((reg_snap)->sw.r4) #define arch_syscall_arg5(reg_snap) ((reg_snap)->sw.r4)
#define arch_syscall_arg6(reg_snap) ((reg_snap)->sw.r5) #define arch_syscall_arg6(reg_snap) ((reg_snap)->sw.r5)
#define arch_syscall_set_rval(reg_snap, val) ((reg_snap)->hw.r0 = (val)); #define arch_syscall_set_rval(reg_snap, val) ((reg_snap)->hw.r0 = (word_t)(val));
/* /*
* Real-time Timer (RTT) * Real-time Timer (RTT)

8
kernel/fs/write.c
View file

@ -10,9 +10,9 @@
#include <stddef.h> #include <stddef.h>
#include <toolchain.h> #include <toolchain.h>
int sys_write(int fd, __user const void *buf, size_t len, size_t off) ssize_t sys_write(int fd, __user const void *buf, size_t len, size_t off)
{ {
int ret; ssize_t ret;
void *copy; void *copy;
if (fd != 1) /* we only support stdout (serial console) right now ... */ if (fd != 1) /* we only support stdout (serial console) right now ... */
@ -23,10 +23,10 @@ int sys_write(int fd, __user const void *buf, size_t len, size_t off)
copy = malloc(len); copy = malloc(len);
if (copy == NULL) if (copy == NULL)
return -ENOMEM; return -ENOMEM;
ret = (int)copy_from_user(copy, buf, len); ret = (ssize_t)copy_from_user(copy, buf, (size_t)len);
/* TODO: reschedule if blocking */ /* TODO: reschedule if blocking */
ret = serial_write(serial_default_interface, copy, ret); ret = serial_write(serial_default_interface, copy, (size_t)ret);
return ret; return ret;
} }

4
kernel/serial.c
View file

@ -50,13 +50,13 @@ ssize_t serial_read(void *dest, struct serial_interface *interface, size_t len)
ssize_t serial_write(struct serial_interface *interface, const void *data, size_t len) ssize_t serial_write(struct serial_interface *interface, const void *data, size_t len)
{ {
size_t ret; ssize_t ret;
atomic_enter(); atomic_enter();
ret = arch_serial_write(interface, data, len); ret = arch_serial_write(interface, data, len);
atomic_leave(); atomic_leave();
return (ssize_t)ret; return ret;
} }
/* /*