summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/phy/rtl.c9
-rw-r--r--sys/include/netinet/if_ether.h1
-rw-r--r--sys/include/sys/syscall.h1
-rw-r--r--sys/include/sys/systm.h2
-rw-r--r--sys/include/sys/time.h11
-rw-r--r--sys/kern/kern_syscall.c2
-rw-r--r--sys/kern/kern_time.c76
-rw-r--r--sys/netinet/if_ether.c33
8 files changed, 108 insertions, 27 deletions
diff --git a/sys/dev/phy/rtl.c b/sys/dev/phy/rtl.c
index 8462a43..691f767 100644
--- a/sys/dev/phy/rtl.c
+++ b/sys/dev/phy/rtl.c
@@ -43,18 +43,11 @@
#include <vm/dynalloc.h>
#include <vm/vm.h>
#include <machine/pio.h>
+#include <machine/intr.h>
#include <string.h>
#define IFNAME "rt0"
-/* TODO: Make this smoother */
-#if defined(__x86_64__)
-#include <machine/intr.h>
-#include <machine/ioapic.h>
-#include <machine/lapic.h>
-#include <machine/idt.h>
-#endif
-
#define pr_trace(fmt, ...) kprintf("rt81xx: " fmt, ##__VA_ARGS__)
#define pr_error(...) pr_trace(__VA_ARGS__)
diff --git a/sys/include/netinet/if_ether.h b/sys/include/netinet/if_ether.h
index 571622d..d3dc9b7 100644
--- a/sys/include/netinet/if_ether.h
+++ b/sys/include/netinet/if_ether.h
@@ -51,5 +51,6 @@ struct ether_frame {
};
int arp_request(struct netif *nifp, uint8_t *sproto, uint8_t *tproto);
+int arp_reply(struct netif *netif, uint8_t *sproto, uint8_t *tproto);
#endif /* !_NETINET_IF_ETHER_H_ */
diff --git a/sys/include/sys/syscall.h b/sys/include/sys/syscall.h
index 37e2286..6d9dae6 100644
--- a/sys/include/sys/syscall.h
+++ b/sys/include/sys/syscall.h
@@ -52,6 +52,7 @@
#define SYS_munmap 11
#define SYS_access 12
#define SYS_lseek 13
+#define SYS_sleep 14
#if defined(_KERNEL)
/* Syscall return value and arg type */
diff --git a/sys/include/sys/systm.h b/sys/include/sys/systm.h
index 5d06257..42e1723 100644
--- a/sys/include/sys/systm.h
+++ b/sys/include/sys/systm.h
@@ -55,7 +55,5 @@ __sigraise(int signo)
dispatch_signals(td);
}
-int hyra_install(void);
-
#endif /* _KERNEL */
#endif /* !_SYS_SYSTM_H_ */
diff --git a/sys/include/sys/time.h b/sys/include/sys/time.h
index 37f3daf..8563fc7 100644
--- a/sys/include/sys/time.h
+++ b/sys/include/sys/time.h
@@ -31,16 +31,27 @@
#define _SYS_TIME_H_
#include <sys/types.h>
+#if defined(_KERNEL)
+#include <sys/syscall.h>
+#endif /* _KERNEL */
struct timeval {
time_t tv_sec;
time_t tv_usec;
};
+struct timespec {
+ time_t tv_sec;
+ long tv_nsec;
+};
+
struct date {
uint8_t sec;
uint8_t min;
uint8_t hour;
};
+#if defined(_KERNEL)
+scret_t sys_sleep(struct syscall_args *scargs);
+#endif
#endif /* !_SYS_TIME_H_ */
diff --git a/sys/kern/kern_syscall.c b/sys/kern/kern_syscall.c
index aaa5d04..b1deb7a 100644
--- a/sys/kern/kern_syscall.c
+++ b/sys/kern/kern_syscall.c
@@ -31,6 +31,7 @@
#include <sys/sysctl.h>
#include <sys/reboot.h>
#include <sys/types.h>
+#include <sys/time.h>
#include <sys/mman.h>
#include <sys/proc.h>
#include <sys/vfs.h>
@@ -50,6 +51,7 @@ scret_t(*g_sctab[])(struct syscall_args *) = {
sys_munmap, /* SYS_munap */
sys_access, /* SYS_access */
sys_lseek, /* SYS_lseek */
+ sys_sleep, /* SYS_sleep */
};
const size_t MAX_SYSCALLS = NELEM(g_sctab);
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
new file mode 100644
index 0000000..102648c
--- /dev/null
+++ b/sys/kern/kern_time.c
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/syscall.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/cdefs.h>
+#include <dev/timer.h>
+#include <machine/cdefs.h>
+
+/*
+ * arg0: Timespec
+ * arg1: Remaining timeval
+ */
+scret_t
+sys_sleep(struct syscall_args *scargs)
+{
+ struct timespec ts;
+ struct timer tmr;
+ size_t timeout_msec;
+ tmrr_status_t status;
+ int error;
+
+ error = copyin((void *)scargs->arg0, &ts, sizeof(ts));
+ if (error < 0) {
+ return error;
+ }
+
+ if (ts.tv_nsec >= 1000000000) {
+ return -EINVAL;
+ }
+
+ status = req_timer(TIMER_GP, &tmr);
+ if (__unlikely(status != TMRR_SUCCESS)) {
+ return -ENOTSUP;
+ }
+ if (__unlikely(tmr.msleep == NULL)) {
+ return -ENOTSUP;
+ }
+
+ timeout_msec = ts.tv_nsec / 1000000;
+ timeout_msec += ts.tv_sec * 1000;
+
+ md_inton();
+ tmr.msleep(timeout_msec);
+ md_intoff();
+ return 0;
+}
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 0c458a4..db1d6d4 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -40,19 +40,6 @@ struct arp_pkt {
struct ether_arp payload;
};
-static void
-set_hwaddr(struct netif_addr *addrp, char addr[ETHER_ADDR_LEN])
-{
- uint16_t *psrc, *p;
-
- psrc = (uint16_t *)&addrp->data[0];
- p = (uint16_t *)addr;
-
- p[0] = swap16(psrc[0]);
- p[1] = swap16(psrc[1]);
- p[2] = swap16(psrc[2]);
-}
-
static struct arp_pkt *
arp_create(struct netif *nifp, uint32_t *sproto, uint32_t *tproto, uint16_t op)
{
@@ -71,7 +58,7 @@ arp_create(struct netif *nifp, uint32_t *sproto, uint32_t *tproto, uint16_t op)
hdrp = &payload->hdr;
/* Ethernet frame, from source to all */
- set_hwaddr(&nifp->addr, frp->ether_saddr);
+ memcpy(frp->ether_saddr, &nifp->addr, ETHER_ADDR_LEN);
memset(frp->ether_daddr, 0xFF, ETHER_ADDR_LEN);
frp->ether_type = swap16(ETHERTYPE_ARP);
@@ -91,8 +78,8 @@ arp_create(struct netif *nifp, uint32_t *sproto, uint32_t *tproto, uint16_t op)
return packet;
}
-int
-arp_request(struct netif *nifp, uint8_t *sproto, uint8_t *tproto)
+static int
+arp_send(struct netif *nifp, uint8_t *sproto, uint8_t *tproto, uint16_t op)
{
struct arp_pkt *packet;
struct netbuf nb;
@@ -108,7 +95,7 @@ arp_request(struct netif *nifp, uint8_t *sproto, uint8_t *tproto)
src_tmp = (uint32_t *)sproto;
targ_tmp = (uint32_t *)tproto;
- packet = arp_create(nifp, src_tmp, targ_tmp, ARP_REQUEST);
+ packet = arp_create(nifp, src_tmp, targ_tmp, op);
if (packet == NULL) {
return -ENOMEM;
}
@@ -121,3 +108,15 @@ arp_request(struct netif *nifp, uint8_t *sproto, uint8_t *tproto)
dynfree(packet);
return 0;
}
+
+int
+arp_request(struct netif *nifp, uint8_t *sproto, uint8_t *tproto)
+{
+ return arp_send(nifp, sproto, tproto, ARP_REQUEST);
+}
+
+int
+arp_reply(struct netif *nifp, uint8_t *sproto, uint8_t *tproto)
+{
+ return arp_send(nifp, sproto, tproto, ARP_REPLY);
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-17 11:52:13 +0000