Merged in sandervrijders/ouroboros/be (pull request #136)

lib: Add errnos specific for Ouroboros

6 files changed, 42 insertions, 8 deletions

diff --git a/include/ouroboros/CMakeLists.txt b/include/ouroboros/CMakeLists.txt
index 8347f928..9e9fc789 100644
--- a/include/ouroboros/CMakeLists.txt
+++ b/include/ouroboros/CMakeLists.txt
@@ -7,11 +7,11 @@ set(HEADER_FILES
         da.h
         dev.h
         dif_config.h
+        errno.h
         flow.h
         instance_name.h
         irm.h
         qos.h
-        time_utils.h
 )
 
 install(FILES ${HEADER_FILES} DESTINATION usr/include/ouroboros)
diff --git a/include/ouroboros/common.h b/include/ouroboros/common.h
index f2c8a9ec..039e1a83 100644
--- a/include/ouroboros/common.h
+++ b/include/ouroboros/common.h
@@ -39,4 +39,10 @@ enum qos_cube {
         QOS_CUBE_VIDEO
 };
 
+enum flow_state {
+        FLOW_NULL = 0,
+        FLOW_PENDING,
+        FLOW_ALLOCATED
+};
+
 #endif /* OUROBOROS_COMMON_H */
diff --git a/include/ouroboros/dev.h b/include/ouroboros/dev.h
index ee253ff8..897bc124 100644
--- a/include/ouroboros/dev.h
+++ b/include/ouroboros/dev.h
@@ -29,7 +29,6 @@
 #ifndef OUROBOROS_DEV_H
 #define OUROBOROS_DEV_H
 
-#define UNKNOWN_AP "__UNKNOWN_AP__"
 #define UNKNOWN_AE "__UNKNOWN_AE__"
 
 /* These calls should be removed once we write the ouroboros OS. */
diff --git a/include/ouroboros/errno.h b/include/ouroboros/errno.h
new file mode 100644
index 00000000..49720548
--- /dev/null
+++ b/include/ouroboros/errno.h
@@ -0,0 +1,33 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * Ouroboros specific error numbers
+ *
+ *    Sander Vrijders <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef OUROBOROS_ERRNO_H
+#define OUROBOROS_ERRNO_H
+
+#include <errno.h>
+
+#define ENOSHM       1000 /* Creation or access of shared memory failed */
+#define EIRM         1001 /* Could not talk to the IPC Resource Manager */
+#define ENOTALLOC    1002 /* Flow is not allocated */
+#define EIPCPTYPE    1003 /* Unknown IPCP type */
+
+#endif
diff --git a/include/ouroboros/flow.h b/include/ouroboros/flow.h
index aa377034..754c7632 100644
--- a/include/ouroboros/flow.h
+++ b/include/ouroboros/flow.h
@@ -37,10 +37,4 @@
 #define FLOW_F_GETFL    00000001
 #define FLOW_F_SETFL    00000002
 
-enum flow_state {
-        FLOW_NULL = 0,
-        FLOW_PENDING,
-        FLOW_ALLOCATED
-};
-
 #endif /* OUROBOROS_FLOW_H */
diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h
index 9d547643..743ed79c 100644
--- a/include/ouroboros/irm.h
+++ b/include/ouroboros/irm.h
@@ -46,9 +46,11 @@ int irm_reg(char *            name,
             bool              autoexec,
             char **           difs,
             size_t            difs_size);
+
 int irm_unreg(char *                  name,
               const instance_name_t * api,
               char **                 difs,
               size_t                  difs_size,
               bool                    hard);
+
 #endif /* OUROBOROS_IRM_H */