6 files changed, 117 insertions, 38 deletions
diff --git a/sys/include/net/ethertypes.h b/sys/include/net/ethertypes.h
new file mode 100644
index 0000000..753ea10
--- /dev/null
+++ b/sys/include/net/ethertypes.h
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+#ifndef _NET_ETHERTYPES_H_
+#define _NET_ETHERTYPES_H_
+
+#define ETHERTYPE_IPV4   0x0800
+#define ETHERTYPE_ARP    0x0806
+
+#endif  /* !_NET_ETHERTYPES_H_ */
diff --git a/sys/include/net/if_arp.h b/sys/include/net/if_arp.h
new file mode 100644
index 0000000..cbfb2fe
--- /dev/null
+++ b/sys/include/net/if_arp.h
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+#ifndef _NETINET_IF_ARP_H_
+#define _NETINET_IF_ARP_H_
+
+#include <sys/types.h>
+#include <net/ethertypes.h>
+
+/* ARP hardware types */
+#define ARP_HWTYPE_ETHER 1
+
+/* ARP operation types */
+#define ARP_REQUEST 1
+#define ARP_REPLY   2
+
+struct arp_hdr {
+    uint16_t hw_type;      /* See ARP_HWTYPE_*  */
+    uint16_t proto_type;   /* See ETHERTYPE_*  */
+    uint8_t hw_len;        /* See ETHER_ADDR_LEN */
+    uint8_t proto_len;     /* Protocol address length */
+    uint16_t op_type;      /* See operation types above */
+};
+
+#endif  /* !_NETINET_IF_ARP_H_ */
diff --git a/sys/include/net/if_ether.h b/sys/include/netinet/if_ether.h
index a8fcfa5..d3dc9b7 100644
--- a/sys/include/net/if_ether.h
+++ b/sys/include/netinet/if_ether.h
@@ -27,48 +27,30 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _IF_ETHER_H_
-#define _IF_ETHER_H_
+#ifndef _NETINET_IF_ETHER_H_
+#define _NETINET_IF_ETHER_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
-#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/if_var.h>
 
-#define MACADDR_LEN 6
+#define ETHER_ADDR_LEN 6
 
-struct __packed ether_frame {
-    uint8_t sync[7];        /* Preamble (sync stuff) */
-    uint8_t spd;            /* Start frame delimiter */
-    uint8_t macd[6];        /* MAC destination */
-    uint8_t macs[6];        /* MAC source */
-    uint16_t type;          /* Protocol type */
-    char payload[1];        /* sized @ 1+n */
+struct ether_arp {
+    struct arp_hdr hdr;
+    uint8_t sha[ETHER_ADDR_LEN];
+    uint8_t spa[4];
+    uint8_t tha[ETHER_ADDR_LEN];
+    uint8_t tpa[4];
 };
 
-/*
- * Used by the driver to buffer packets.
- */
-struct etherbuf {
-    struct ether_frame *frp;
-    off_t head;
-    off_t tail;
-    size_t cap;     /* In entries */
+struct ether_frame {
+    uint8_t ether_daddr[ETHER_ADDR_LEN];
+    uint8_t ether_saddr[ETHER_ADDR_LEN];
+    uint16_t ether_type;
 };
 
-/*
- * Ethernet device
- *
- * if_ether: E
- * driver: D
- *
- * @if_name: Interface name.
- * @tx: Transmit packets (D->E)
- */
-struct etherdev {
-    char if_name[IFNAMESIZ];
-    struct etherbuf *buf;
-    ssize_t(*tx)(struct etherdev *ep, const void *buf, size_t len);
-    char mac_addr[MACADDR_LEN];
-};
+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  /* !_IF_ETHER_H_ */
+#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_ */