Merged in dstaesse/ouroboros/be-qoscube (pull request #329)

Some fixes

3 files changed, 19 insertions, 19 deletions

diff --git a/src/ipcpd/normal/fmgr.h b/src/ipcpd/normal/fmgr.h
index 30267666..e17f3f55 100644
--- a/src/ipcpd/normal/fmgr.h
+++ b/src/ipcpd/normal/fmgr.h
@@ -37,10 +37,10 @@ int fmgr_init(void);
 
 int fmgr_fini(void);
 
-int fmgr_np1_alloc(int           fd,
-                   char *        dst_ap_name,
-                   char *        src_ae_name,
-                   enum qos_cube qos);
+int fmgr_np1_alloc(int       fd,
+                   char *    dst_ap_name,
+                   char *    src_ae_name,
+                   qoscube_t qos);
 
 int fmgr_np1_alloc_resp(int fd,
                         int response);
@@ -55,8 +55,8 @@ int fmgr_np1_post_sdu(cep_id_t             id,
 
 int fmgr_nm1_mgmt_flow(char * dst_name);
 
-int fmgr_nm1_dt_flow(char * dst_name,
-                     enum qos_cube qos);
+int fmgr_nm1_dt_flow(char *    dst_name,
+                     qoscube_t qos);
 
 int fmgr_nm1_write_sdu(struct pci *         pci,
                        struct shm_du_buff * sdb);
diff --git a/src/ipcpd/normal/frct.c b/src/ipcpd/normal/frct.c
index a45e3528..33bd044b 100644
--- a/src/ipcpd/normal/frct.c
+++ b/src/ipcpd/normal/frct.c
@@ -43,7 +43,7 @@ struct frct_i {
         uint32_t cep_id;
         uint64_t r_address;
         uint32_t r_cep_id;
-        enum qos_cube cube;
+        qoscube_t cube;
         uint64_t seqno;
 
         enum conn_state state;
@@ -217,9 +217,9 @@ static void destroy_frct_i(struct frct_i * instance)
         free(instance);
 }
 
-cep_id_t frct_i_create(uint64_t      address,
-                       buffer_t *    buf,
-                       enum qos_cube cube)
+cep_id_t frct_i_create(uint64_t   address,
+                       buffer_t * buf,
+                       qoscube_t  cube)
 {
         struct frct_i * instance;
         struct pci pci;
@@ -255,9 +255,9 @@ cep_id_t frct_i_create(uint64_t      address,
         return id;
 }
 
-int frct_i_accept(cep_id_t       id,
-                  buffer_t *     buf,
-                  enum qos_cube  cube)
+int frct_i_accept(cep_id_t   id,
+                  buffer_t * buf,
+                  qoscube_t  cube)
 {
         struct pci pci;
         struct frct_i * instance;
diff --git a/src/ipcpd/normal/frct.h b/src/ipcpd/normal/frct.h
index 38dcddf4..39c47cdd 100644
--- a/src/ipcpd/normal/frct.h
+++ b/src/ipcpd/normal/frct.h
@@ -33,13 +33,13 @@ int         frct_init(void);
 
 int         frct_fini(void);
 
-cep_id_t    frct_i_create(uint64_t      address,
-                          buffer_t *    buf,
-                          enum qos_cube cube);
+cep_id_t    frct_i_create(uint64_t   address,
+                          buffer_t * buf,
+                          qoscube_t  cube);
 
-int         frct_i_accept(cep_id_t      id,
-                          buffer_t *    buf,
-                          enum qos_cube cube);
+int         frct_i_accept(cep_id_t   id,
+                          buffer_t * buf,
+                          qoscube_t  cube);
 
 int         frct_i_destroy(cep_id_t   id,
                            buffer_t * buf);