meta: rename

include/mango/arg.h

@@ -1,8 +1,8 @@
-#ifndef SOCKS_ARG_H_
-#define SOCKS_ARG_H_
+#ifndef MANGO_ARG_H_
+#define MANGO_ARG_H_
 
 #include <stdbool.h>
-#include <socks/status.h>
+#include <mango/status.h>
 
 #define CMDLINE_MAX 4096
 

include/mango/bitmap.h

@@ -1,5 +1,5 @@
-#ifndef SOCKS_BITMAP_H_
-#define SOCKS_BITMAP_H_
+#ifndef MANGO_BITMAP_H_
+#define MANGO_BITMAP_H_
 
 #include <stdbool.h>
 

include/mango/block.h

@@ -1,10 +1,10 @@
-#ifndef SOCKS_BLOCK_H_
-#define SOCKS_BLOCK_H_
+#ifndef MANGO_BLOCK_H_
+#define MANGO_BLOCK_H_
 
-#include <socks/types.h>
-#include <socks/btree.h>
-#include <socks/locks.h>
-#include <socks/status.h>
+#include <mango/types.h>
+#include <mango/btree.h>
+#include <mango/locks.h>
+#include <mango/status.h>
 #include <stdbool.h>
 
 enum block_device_flags {

include/mango/btree.h

@@ -20,8 +20,8 @@
     software without specific prior written permission.
  */
 
-#ifndef SOCKS_BTREE_H_
-#define SOCKS_BTREE_H_
+#ifndef MANGO_BTREE_H_
+#define MANGO_BTREE_H_
 
 #include <stdint.h>
 

include/mango/clock.h

@@ -1,5 +1,5 @@
-#ifndef SOCKS_CLOCK_H_
-#define SOCKS_CLOCK_H_
+#ifndef MANGO_CLOCK_H_
+#define MANGO_CLOCK_H_
 
 #include <stdint.h>
 

include/mango/compiler.h

@@ -1,5 +1,5 @@
-#ifndef SOCKS_COMPILER_H_
-#define SOCKS_COMPILER_H_
+#ifndef MANGO_COMPILER_H_
+#define MANGO_COMPILER_H_
 
 #ifdef __cplusplus
 template <typename T>

include/mango/console.h

@@ -1,5 +1,5 @@
-#ifndef SOCKS_CONSOLE_H_
-#define SOCKS_CONSOLE_H_
+#ifndef MANGO_CONSOLE_H_
+#define MANGO_CONSOLE_H_
 
 /* The console system
 
@@ -14,9 +14,9 @@
    representing a serial port may allow both sending AND receiving over the
    port.
 */
-#include <socks/queue.h>
-#include <socks/locks.h>
-#include <socks/status.h>
+#include <mango/queue.h>
+#include <mango/locks.h>
+#include <mango/status.h>
 
 #ifdef __cplusplus
 extern "C" {

include/mango/cpu.h

@@ -1,10 +1,10 @@
-#ifndef SOCKS_CPU_H_
-#define SOCKS_CPU_H_
+#ifndef MANGO_CPU_H_
+#define MANGO_CPU_H_
 
-#include <socks/types.h>
-#include <socks/machine/cpu.h>
+#include <mango/types.h>
+#include <mango/machine/cpu.h>
 #include <stdint.h>
-#include <socks/sched.h>
+#include <mango/sched.h>
 
 #ifdef __cplusplus
 extern "C" {

include/mango/device.h

@@ -1,14 +1,14 @@
-#ifndef SOCKS_DEVICE_H_
-#define SOCKS_DEVICE_H_
+#ifndef MANGO_DEVICE_H_
+#define MANGO_DEVICE_H_
 
-#include <socks/queue.h>
-#include <socks/btree.h>
-#include <socks/status.h>
-#include <socks/bitmap.h>
-#include <socks/object.h>
-#include <socks/block.h>
-#include <socks/fb.h>
-#include <socks/ringbuffer.h>
+#include <mango/queue.h>
+#include <mango/btree.h>
+#include <mango/status.h>
+#include <mango/bitmap.h>
+#include <mango/object.h>
+#include <mango/block.h>
+#include <mango/fb.h>
+#include <mango/ringbuffer.h>
 
 struct device;
 struct input_event;
@@ -50,14 +50,14 @@ struct iovec {
 };
 
 struct device_type_ops {
-	kern_status_t(*read)(struct device *, void *, size_t, size_t, size_t *, socks_flags_t);
-	kern_status_t(*write)(struct device *, const void *, size_t, size_t, size_t *, socks_flags_t);
+	kern_status_t(*read)(struct device *, void *, size_t, size_t, size_t *, mango_flags_t);
+	kern_status_t(*write)(struct device *, const void *, size_t, size_t, size_t *, mango_flags_t);
 	kern_status_t(*register_device)(struct device *);
 };
 
 struct block_device_ops {
-	kern_status_t(*read_blocks)(struct device *, sectors_t, size_t *, struct iovec *, size_t, socks_flags_t);
-	kern_status_t(*write_blocks)(struct device *, sectors_t, size_t *, struct iovec *, size_t, socks_flags_t);
+	kern_status_t(*read_blocks)(struct device *, sectors_t, size_t *, struct iovec *, size_t, mango_flags_t);
+	kern_status_t(*write_blocks)(struct device *, sectors_t, size_t *, struct iovec *, size_t, mango_flags_t);
 	kern_status_t(*ioctl)(struct device *, unsigned int, void *);
 };
 
@@ -69,8 +69,8 @@ struct net_device_ops {
 };
 
 struct char_device_ops {
-	kern_status_t(*read)(struct device *, void *, size_t, size_t, size_t *, socks_flags_t);
-	kern_status_t(*write)(struct device *, const void *, size_t, size_t, size_t *, socks_flags_t);
+	kern_status_t(*read)(struct device *, void *, size_t, size_t, size_t *, mango_flags_t);
+	kern_status_t(*write)(struct device *, const void *, size_t, size_t, size_t *, mango_flags_t);
 };
 
 struct input_device_ops {
@@ -198,8 +198,8 @@ static inline void device_unlock_irqrestore(struct device *dev, unsigned long fl
 	object_unlock_irqrestore(&dev->dev_base, flags);
 }
 
-extern kern_status_t device_read(struct device *dev, void *buf, size_t offset, size_t size, size_t *bytes_read, socks_flags_t flags);
-extern kern_status_t device_write(struct device *dev, const void *buf, size_t offset, size_t size, size_t *bytes_written, socks_flags_t flags);
+extern kern_status_t device_read(struct device *dev, void *buf, size_t offset, size_t size, size_t *bytes_read, mango_flags_t flags);
+extern kern_status_t device_write(struct device *dev, const void *buf, size_t offset, size_t size, size_t *bytes_written, mango_flags_t flags);
 
 extern struct device *cast_to_device(struct object *obj);
 
@@ -290,7 +290,7 @@ static inline void device_deref(struct device *dev)
 
 extern kern_status_t input_device_report_event(struct input_device *dev, const struct input_event *ev, bool noblock);
 extern kern_status_t input_device_read(struct device *dev, void *buf, size_t offset,
-                                       size_t size, size_t *bytes_read, socks_flags_t flags);
+                                       size_t size, size_t *bytes_read, mango_flags_t flags);
 extern kern_status_t input_device_add_hook(struct device *dev, struct input_event_hook *hook);
 extern kern_status_t input_device_remove_hook(struct device *dev, struct input_event_hook *hook);
 

include/mango/fb.h

@@ -1,5 +1,5 @@
-#ifndef SOCKS_FB_H_
-#define SOCKS_FB_H_
+#ifndef MANGO_FB_H_
+#define MANGO_FB_H_
 
 #include <stdint.h>
 

include/mango/flags.h

@@ -1,11 +1,11 @@
-#ifndef SOCKS_FLAGS_H_
-#define SOCKS_FLAGS_H_
+#ifndef MANGO_FLAGS_H_
+#define MANGO_FLAGS_H_
 
 #include <stdint.h>
 
 typedef enum {
 	S_NORMAL = 0x00u,
 	S_NOBLOCK = 0x01u,
-} socks_flags_t;
+} mango_flags_t;
 
 #endif

include/mango/init.h

@@ -1,8 +1,8 @@
-#ifndef SOCKS_INIT_H_
-#define SOCKS_INIT_H_
+#ifndef MANGO_INIT_H_
+#define MANGO_INIT_H_
 
-#include <socks/compiler.h>
-#include <socks/machine/init.h>
+#include <mango/compiler.h>
+#include <mango/machine/init.h>
 
 #ifdef __cplusplus
 extern "C" {

include/mango/input.h

@@ -1,9 +1,9 @@
-#ifndef SOCKS_INPUT_H_
-#define SOCKS_INPUT_H_
+#ifndef MANGO_INPUT_H_
+#define MANGO_INPUT_H_
 
 #include <stdint.h>
-#include <socks/queue.h>
-#include <socks/status.h>
+#include <mango/queue.h>
+#include <mango/status.h>
 
 enum input_event_hook_flags {
 	INPUT_HOOK_SQUASH_EVENT = 0x01u,

include/mango/kext.h

@@ -1,19 +1,19 @@
-#ifndef SOCKS_KEXT_H_
-#define SOCKS_KEXT_H_
+#ifndef MANGO_KEXT_H_
+#define MANGO_KEXT_H_
 
-#include <socks/status.h>
-#include <socks/object.h>
-#include <socks/compiler.h>
-#include <socks/btree.h>
+#include <mango/status.h>
+#include <mango/object.h>
+#include <mango/compiler.h>
+#include <mango/btree.h>
 
-#define KERNEL_KEXT_ID "net.doorstuck.socks-kernel"
+#define KERNEL_KEXT_ID "net.doorstuck.mango-kernel"
 #define KEXT_IDENT_MAX 80
 #define KEXT_NO_DEPENDENCIES NULL
 
 #define __KEXT_INFO_VARNAME_2(a, b) a ## b
 #define __KEXT_INFO_VARNAME_1(a, b) __KEXT_INFO_VARNAME_2(a, b)
 
-#ifdef SOCKS_INTERNAL
+#ifdef MANGO_INTERNAL
 #define __KEXT_INFO_LINKAGE static
 #define __KEXT_INFO_VARNAME() __KEXT_INFO_VARNAME_1(__kext_info, __LINE__)
 #define __KEXT_INFO_DEPNAME() __KEXT_INFO_VARNAME_1(__kext_deps, __LINE__)

include/mango/locks.h

@@ -1,8 +1,8 @@
-#ifndef SOCKS_LOCKS_H_
-#define SOCKS_LOCKS_H_
+#ifndef MANGO_LOCKS_H_
+#define MANGO_LOCKS_H_
 
-#include <socks/compiler.h>
-#include <socks/machine/hwlock.h>
+#include <mango/compiler.h>
+#include <mango/machine/hwlock.h>
 
 #ifdef __cplusplus
 extern "C" {

include/mango/memblock.h

@@ -19,12 +19,12 @@
     contributors may be used to endorse or promote products derived from this
     software without specific prior written permission.
  */
-#ifndef SOCKS_MEMBLOCK_H_
-#define SOCKS_MEMBLOCK_H_
+#ifndef MANGO_MEMBLOCK_H_
+#define MANGO_MEMBLOCK_H_
 
 #include <stddef.h>
 #include <limits.h>
-#include <socks/types.h>
+#include <mango/types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/mango/object.h

@@ -1,10 +1,10 @@
-#ifndef SOCKS_OBJECT_H_
-#define SOCKS_OBJECT_H_
+#ifndef MANGO_OBJECT_H_
+#define MANGO_OBJECT_H_
 
-#include <socks/locks.h>
-#include <socks/status.h>
-#include <socks/flags.h>
-#include <socks/vm.h>
+#include <mango/locks.h>
+#include <mango/status.h>
+#include <mango/flags.h>
+#include <mango/vm.h>
 #include <stddef.h>
 
 #ifdef __cplusplus
@@ -32,8 +32,8 @@ enum object_type_flags {
 struct object_ops {
 	kern_status_t(*open)(struct object *obj);
 	kern_status_t(*close)(struct object *obj);
-	kern_status_t(*read)(struct object *obj, void *p, size_t off, size_t *r, socks_flags_t flags);
-	kern_status_t(*write)(struct object *obj, const void *p, size_t off, size_t *w, socks_flags_t flags);
+	kern_status_t(*read)(struct object *obj, void *p, size_t off, size_t *r, mango_flags_t flags);
+	kern_status_t(*write)(struct object *obj, const void *p, size_t off, size_t *w, mango_flags_t flags);
 	kern_status_t(*destroy)(struct object *obj);
 	kern_status_t(*query_name)(struct object *obj, char out[OBJECT_NAME_MAX]);
 	kern_status_t(*parse)(struct object *obj, const char *path, struct object **out);
@@ -92,8 +92,8 @@ static inline kern_status_t object_get(const char *path, struct object **out)
 {
 	return object_namespace_get_object(global_namespace(), path, out);
 }
-extern kern_status_t object_read(struct object *obj, void *p, size_t offset, size_t max, size_t *nr_read, socks_flags_t flags);
-extern kern_status_t object_write(struct object *obj, const void *p, size_t offset, size_t max, size_t *nr_written, socks_flags_t flags);
+extern kern_status_t object_read(struct object *obj, void *p, size_t offset, size_t max, size_t *nr_read, mango_flags_t flags);
+extern kern_status_t object_write(struct object *obj, const void *p, size_t offset, size_t max, size_t *nr_written, mango_flags_t flags);
 extern kern_status_t object_get_child_named(struct object *obj, const char *name, struct object **out);
 extern kern_status_t object_get_child_at(struct object *obj, size_t at, struct object **out);
 extern kern_status_t object_query_name(struct object *obj, char name[OBJECT_NAME_MAX]);

include/mango/panic.h

@@ -1,7 +1,7 @@
-#ifndef SOCKS_PANIC_H_
-#define SOCKS_PANIC_H_
+#ifndef MANGO_PANIC_H_
+#define MANGO_PANIC_H_
 
-#include <socks/compiler.h>
+#include <mango/compiler.h>
 
 struct cpu_context;
 

include/mango/percpu.h

@@ -1,9 +1,9 @@
-#ifndef SOCKS_PERCPU_H_
-#define SOCKS_PERCPU_H_
+#ifndef MANGO_PERCPU_H_
+#define MANGO_PERCPU_H_
 
-#include <socks/status.h>
-#include <socks/compiler.h>
-#include <socks/sched.h>
+#include <mango/status.h>
+#include <mango/compiler.h>
+#include <mango/sched.h>
 
 #ifdef __cplusplus
 extern "C" {

include/mango/pmap.h

@@ -1,11 +1,11 @@
-#ifndef SOCKS_PMAP_H_
-#define SOCKS_PMAP_H_
+#ifndef MANGO_PMAP_H_
+#define MANGO_PMAP_H_
 
 /* all the functions declared in this file are defined in arch/xyz/pmap.c */
 
-#include <socks/vm.h>
-#include <socks/status.h>
-#include <socks/machine/pmap.h>
+#include <mango/vm.h>
+#include <mango/status.h>
+#include <mango/machine/pmap.h>
 #include <stddef.h>
 
 #define PFN(x) ((x) >> VM_PAGE_SHIFT)

include/mango/printk.h

@@ -1,7 +1,7 @@
-#ifndef SOCKS_PRINTK_H_
-#define SOCKS_PRINTK_H_
+#ifndef MANGO_PRINTK_H_
+#define MANGO_PRINTK_H_
 
-#include <socks/console.h>
+#include <mango/console.h>
 
 #ifdef __cplusplus
 extern "C" {

include/mango/queue.h

@@ -1,7 +1,7 @@
-#ifndef SOCKS_QUEUE_H_
-#define SOCKS_QUEUE_H_
+#ifndef MANGO_QUEUE_H_
+#define MANGO_QUEUE_H_
 
-#include <socks/libc/string.h>
+#include <mango/libc/string.h>
 #include <stdbool.h>
 
 #ifdef __cplusplus

include/mango/ringbuffer.h

@@ -1,8 +1,8 @@
-#ifndef SOCKS_RINGBUFFER_H_
-#define SOCKS_RINGBUFFER_H_
+#ifndef MANGO_RINGBUFFER_H_
+#define MANGO_RINGBUFFER_H_
 
-#include <socks/locks.h>
-#include <socks/sched.h>
+#include <mango/locks.h>
+#include <mango/sched.h>
 
 struct ringbuffer {
 	unsigned char *r_buffer;
@@ -22,8 +22,8 @@ extern kern_status_t ringbuffer_deinit(struct ringbuffer *buf);
 
 extern size_t ringbuffer_unread(struct ringbuffer *buf);
 extern size_t ringbuffer_avail(struct ringbuffer *buf);
-extern size_t ringbuffer_read(struct ringbuffer *buf, size_t size, void *buffer, socks_flags_t flags);
-extern size_t ringbuffer_write(struct ringbuffer *buf, size_t size, const void *buffer, socks_flags_t flags);
+extern size_t ringbuffer_read(struct ringbuffer *buf, size_t size, void *buffer, mango_flags_t flags);
+extern size_t ringbuffer_write(struct ringbuffer *buf, size_t size, const void *buffer, mango_flags_t flags);
 
 /* TODO */
 //extern size_t ringbuffer_peek(struct ringbuffer *buf, size_t at, size_t size, void *buffer);

include/mango/sched.h

@@ -1,12 +1,12 @@
-#ifndef SOCKS_SCHED_H_
-#define SOCKS_SCHED_H_
+#ifndef MANGO_SCHED_H_
+#define MANGO_SCHED_H_
 
-#include <socks/btree.h>
-#include <socks/locks.h>
-#include <socks/object.h>
-#include <socks/pmap.h>
-#include <socks/queue.h>
-#include <socks/status.h>
+#include <mango/btree.h>
+#include <mango/locks.h>
+#include <mango/object.h>
+#include <mango/pmap.h>
+#include <mango/queue.h>
+#include <mango/status.h>
 
 #define TASK_NAME_MAX       64
 #define PRIO_MAX            32

include/mango/status.h

@@ -1,5 +1,5 @@
-#ifndef SOCKS_STATUS_H_
-#define SOCKS_STATUS_H_
+#ifndef MANGO_STATUS_H_
+#define MANGO_STATUS_H_
 
 typedef unsigned int kern_status_t;
 

include/mango/termios.h

@@ -1,5 +1,5 @@
-#ifndef SOCKS_TERMIOS_H_
-#define SOCKS_TERMIOS_H_
+#ifndef MANGO_TERMIOS_H_
+#define MANGO_TERMIOS_H_
 
 #include <stdint.h>
 

include/mango/test.h

@@ -1,5 +1,5 @@
-#ifndef SOCKS_TEST_H_
-#define SOCKS_TEST_H_
+#ifndef MANGO_TEST_H_
+#define MANGO_TEST_H_
 
 #ifdef __cplusplus
 extern "C" {

include/mango/tty.h

@@ -1,11 +1,11 @@
-#ifndef SOCKS_TTY_H_
-#define SOCKS_TTY_H_
+#ifndef MANGO_TTY_H_
+#define MANGO_TTY_H_
 
-#include <socks/status.h>
-#include <socks/device.h>
-#include <socks/queue.h>
-#include <socks/object.h>
-#include <socks/termios.h>
+#include <mango/status.h>
+#include <mango/device.h>
+#include <mango/queue.h>
+#include <mango/object.h>
+#include <mango/termios.h>
 #include <stdint.h>
 
 #define TTY_DEVICE(dev) ((dev)->dev_type == DEV_TYPE_CHAR ? (dev)->chr.c_tty : NULL)
@@ -94,7 +94,7 @@ struct tty_driver {
 
 struct tty_ldisc {
 	char name[OBJECT_NAME_MAX];
-	kern_status_t(*read)(struct device *, void *, size_t, size_t *, socks_flags_t);
+	kern_status_t(*read)(struct device *, void *, size_t, size_t *, mango_flags_t);
 	void(*write)(struct device *, const struct input_event *);
 };
 
@@ -134,8 +134,8 @@ static inline struct driver *tty_driver_base(struct tty_driver *drv)
 	return &drv->tty_base;
 }
 
-extern kern_status_t tty_read(struct device *tty, void *buf, size_t offset, size_t max, size_t *nr_read, socks_flags_t flags);
-extern kern_status_t tty_write(struct device *tty, const void *buf, size_t offset, size_t len, size_t *nr_written, socks_flags_t flags);
+extern kern_status_t tty_read(struct device *tty, void *buf, size_t offset, size_t max, size_t *nr_read, mango_flags_t flags);
+extern kern_status_t tty_write(struct device *tty, const void *buf, size_t offset, size_t len, size_t *nr_written, mango_flags_t flags);
 extern kern_status_t tty_report_event(struct device *tty, const struct input_event *ev);
 
 #ifdef __cplusplus

include/mango/types.h

@@ -1,5 +1,5 @@
-#ifndef SOCKS_TYPES_H_
-#define SOCKS_TYPES_H_
+#ifndef MANGO_TYPES_H_
+#define MANGO_TYPES_H_
 
 #include <stdint.h>
 

include/mango/util.h

@@ -1,5 +1,5 @@
-#ifndef SOCKS_UTIL_H_
-#define SOCKS_UTIL_H_
+#ifndef MANGO_UTIL_H_
+#define MANGO_UTIL_H_
 
 #include <stddef.h>
 #include <stdint.h>

include/mango/vm.h

@@ -1,14 +1,14 @@
-#ifndef SOCKS_VM_H_
-#define SOCKS_VM_H_
+#ifndef MANGO_VM_H_
+#define MANGO_VM_H_
 
 #include <stddef.h>
-#include <socks/types.h>
-#include <socks/status.h>
-#include <socks/queue.h>
-#include <socks/btree.h>
-#include <socks/bitmap.h>
-#include <socks/locks.h>
-#include <socks/machine/vm.h>
+#include <mango/types.h>
+#include <mango/status.h>
+#include <mango/queue.h>
+#include <mango/btree.h>
+#include <mango/bitmap.h>
+#include <mango/locks.h>
+#include <mango/machine/vm.h>
 
 #ifdef __cplusplus
 extern "C" {