remove usb_mem.h

common/usb_mem.h

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2022, sakumisu
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#ifndef USB_MEM_H
-#define USB_MEM_H
-
-#define USB_MEM_ALIGNX __attribute__((aligned(CONFIG_USB_ALIGN_SIZE)))
-
-#if (CONFIG_USB_ALIGN_SIZE > 4)
-static inline void *usb_iomalloc(size_t size)
-{
-    void *ptr;
-    void *align_ptr;
-    int uintptr_size;
-    size_t align_size;
-    uint32_t align = CONFIG_USB_ALIGN_SIZE;
-
-    /* sizeof pointer */
-    uintptr_size = sizeof(void *);
-    uintptr_size -= 1;
-
-    /* align the alignment size to uintptr size byte */
-    align = ((align + uintptr_size) & ~uintptr_size);
-
-    /* get total aligned size */
-    align_size = ((size + uintptr_size) & ~uintptr_size) + align;
-    /* allocate memory block from heap */
-    ptr = usb_malloc(align_size);
-    if (ptr != NULL) {
-        /* the allocated memory block is aligned */
-        if (((unsigned long)ptr & (align - 1)) == 0) {
-            align_ptr = (void *)((unsigned long)ptr + align);
-        } else {
-            align_ptr = (void *)(((unsigned long)ptr + (align - 1)) & ~(align - 1));
-        }
-
-        /* set the pointer before alignment pointer to the real pointer */
-        *((unsigned long *)((unsigned long)align_ptr - sizeof(void *))) = (unsigned long)ptr;
-
-        ptr = align_ptr;
-    }
-
-    return ptr;
-}
-
-static inline void usb_iofree(void *ptr)
-{
-    void *real_ptr;
-
-    real_ptr = (void *)*(unsigned long *)((unsigned long)ptr - sizeof(void *));
-    usb_free(real_ptr);
-}
-#else
-#define usb_iomalloc(size) usb_malloc(size)
-#define usb_iofree(ptr)    usb_free(ptr)
-#endif
-
-#endif /* USB_MEM_H */

common/usb_osal.h

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2022, sakumisu
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef USB_OSAL_H
+#define USB_OSAL_H
+
+#include <stdint.h>
+#include <string.h>
+
+#define USB_OSAL_WAITING_FOREVER (0xFFFFFFFFU)
+
+typedef void *usb_osal_thread_t;
+typedef void *usb_osal_sem_t;
+typedef void *usb_osal_mutex_t;
+typedef void *usb_osal_mq_t;
+typedef void (*usb_thread_entry_t)(void *argument);
+
+/*
+ * Task with smaller priority value indicates higher task priority
+*/
+usb_osal_thread_t usb_osal_thread_create(const char *name, uint32_t stack_size, uint32_t prio, usb_thread_entry_t entry, void *args);
+void usb_osal_thread_delete(usb_osal_thread_t thread);
+
+usb_osal_sem_t usb_osal_sem_create(uint32_t initial_count);
+void usb_osal_sem_delete(usb_osal_sem_t sem);
+int usb_osal_sem_take(usb_osal_sem_t sem, uint32_t timeout);
+int usb_osal_sem_give(usb_osal_sem_t sem);
+
+usb_osal_mutex_t usb_osal_mutex_create(void);
+void usb_osal_mutex_delete(usb_osal_mutex_t mutex);
+int usb_osal_mutex_take(usb_osal_mutex_t mutex);
+int usb_osal_mutex_give(usb_osal_mutex_t mutex);
+
+usb_osal_mq_t usb_osal_mq_create(uint32_t max_msgs);
+int usb_osal_mq_send(usb_osal_mq_t mq, uintptr_t addr);
+int usb_osal_mq_recv(usb_osal_mq_t mq, uintptr_t *addr, uint32_t timeout);
+
+size_t usb_osal_enter_critical_section(void);
+void usb_osal_leave_critical_section(size_t flag);
+
+void usb_osal_msleep(uint32_t delay);
+
+#endif /* USB_OSAL_H */

common/usb_util.h

@@ -203,4 +203,6 @@
         19, 18, 17, 16, 15, 14, 13, 12, 11, 10, \
         9, 8, 7, 6, 5, 4, 3, 2, 1, 0
 
+#define USB_MEM_ALIGNX __attribute__((aligned(CONFIG_USB_ALIGN_SIZE)))
+
 #endif /* USB_UTIL_H */