Trivial: style

Signed-off-by: Lucy <[email protected]>

Author: lucypa

.github/workflows/push.yml

@@ -31,5 +31,3 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: seL4/ci-actions/style@master
-      with:
-        diff_only: true

.github/workflows/trigger.yml

@@ -17,4 +17,3 @@ add_subdirectory(libvswitch)
 add_subdirectory(libfdtgen)
 add_subdirectory(libtx2bpmp)
 add_subdirectory(libplatsupportports)
-add_subdirectory(libsharedringbuffer)

CMakeLists.txt

@@ -211,7 +211,7 @@ static inline int dequeue_used(ring_handle_t *ring, uintptr_t *addr, size_t *len
 /**
  * Dequeue an element from a ring buffer.
  * This function is intended for use by the driver, to collect a pointer
- * into this structure to be passed around as a cookie. 
+ * into this structure to be passed around as a cookie.
  *
  * @param ring Ring buffer to dequeue from.
  * @param addr pointer to the address of where to store buffer address.

libsharedringbuffer/CMakeLists.txt

@@ -28,7 +28,4 @@ if(LibUSB)
     add_library(usbdrivers STATIC EXCLUDE_FROM_ALL ${deps})
     target_include_directories(usbdrivers PUBLIC include plat_include/${KernelPlatform})
     target_link_libraries(usbdrivers sel4 muslc platsupport usbdrivers_Config lwip_Config)
-    if(LibLwip)
-        target_link_libraries(usbdrivers lwip)
-    endif()
 endif()

libsharedringbuffer/README.md

@@ -22,7 +22,6 @@
 
 #include <netif/etharp.h>
 #include <lwip/stats.h>
-#include <lwip/snmp.h>
 
 #include "../services.h"
 

libsharedringbuffer/include/shared_ringbuffer/shared_ringbuffer.h

@@ -5,13 +5,13 @@
  */
 #pragma once
 
-#include <platsupport/delay.h>
-#include <platsupport/io.h>
 #include <stdlib.h>
-#include <usb/usb_host.h>
+#include <platsupport/io.h>
+#include <platsupport/delay.h>
 #include <utils/ansi.h>
 #include <utils/util.h>
 #include <utils/zf_log.h>
+#include <usb/usb_host.h>
 
 void otg_irq(void);
 
@@ -21,64 +21,65 @@ void otg_irq(void);
 extern ps_malloc_ops_t *ps_malloc_ops;
 static inline void *usb_malloc(size_t size)
 {
-    int ret;
+	int ret;
 
-    if (ps_malloc_ops && ps_malloc_ops->calloc) {
-        void *ptr;
-        ret = ps_calloc(ps_malloc_ops, 1, size, &ptr);
-        if (0 != ret) {
-            ZF_LOGF("Malloc error %d\n", ret);
-        }
-        return ptr;
-    } else {
-        return calloc(1, size);
-    }
+	if (ps_malloc_ops && ps_malloc_ops->calloc) {
+		void *ptr;
+		ret = ps_calloc(ps_malloc_ops, 1, size, &ptr);
+		if (!ret) {
+			ZF_LOGF("Malloc error\n");
+		}
+		return ptr;
+	} else {
+		return calloc(1, size);
+	}
 }
 
 static inline void usb_free(void *ptr)
 {
-    int ret;
+	int ret;
 
-    if (ps_malloc_ops && ps_malloc_ops->free) {
-        ret = ps_free(ps_malloc_ops, 1, ptr);
-        if (!ret) {
-            ZF_LOGF("Free error\n");
-        }
-    } else {
-        free(ptr);
-    }
+	if (ps_malloc_ops && ps_malloc_ops->free) {
+		ret = ps_free(ps_malloc_ops, 1, ptr);
+		if (!ret) {
+			ZF_LOGF("Free error\n");
+		}
+	} else {
+		free(ptr);
+	}
 }
 
 static inline void dsb()
 {
 #ifdef ARCH_ARM
-    asm volatile("dsb");
+	asm volatile("dsb");
 #else
-    asm volatile("" ::
-                 : "memory");
+	asm volatile ("" ::: "memory");
 #endif
 }
 
-static inline void *ps_dma_alloc_pinned(ps_dma_man_t *dma_man, size_t size,
-                                        int align, int cache,
-                                        ps_mem_flags_t flags, uintptr_t *paddr)
+static inline void *ps_dma_alloc_pinned(ps_dma_man_t * dma_man, size_t size,
+					int align, int cache,
+					ps_mem_flags_t flags, uintptr_t * paddr)
 {
-    void *addr;
-    if (!dma_man) {
-        ZF_LOGF("Invalid arguments\n");
-    }
-    addr = ps_dma_alloc(dma_man, size, align, cache, flags);
-    if (addr != NULL) {
-        *paddr = ps_dma_pin(dma_man, addr, size);
-    }
-    return addr;
+	void *addr;
+	if (!dma_man) {
+		ZF_LOGF("Invalid arguments\n");
+	}
+	addr = ps_dma_alloc(dma_man, size, align, cache, flags);
+	if (addr != NULL) {
+		*paddr = ps_dma_pin(dma_man, addr, size);
+	}
+	return addr;
 }
 
-static inline void ps_dma_free_pinned(ps_dma_man_t *dma_man, void *addr, size_t size)
+static inline void
+ps_dma_free_pinned(ps_dma_man_t * dma_man, void *addr, size_t size)
 {
-    if (!dma_man) {
-        ZF_LOGF("Invalid arguments\n");
-    }
-    ps_dma_unpin(dma_man, addr, size);
-    ps_dma_free(dma_man, addr, size);
+	if (!dma_man) {
+		ZF_LOGF("Invalid arguments\n");
+	}
+	ps_dma_unpin(dma_man, addr, size);
+	ps_dma_free(dma_man, addr, size);
 }
+

libsharedringbuffer/src/shared_ringbuffer.c

@@ -38,40 +38,26 @@ typedef struct vswitch_virtqueues_ {
     virtqueue_device_t *recv_queue;
 } vswitch_virtqueues_t;
 
-extern struct ether_addr null_macaddr, bcast_macaddr, ipv6_multicast_macaddr;
+extern struct ether_addr null_macaddr, bcast_macaddr;
 
 static inline bool
-mac802_addr_eq_num(struct ether_addr *addr0,
-                   struct ether_addr *addr1, unsigned int num)
+mac802_addr_eq(struct ether_addr *addr0,
+               struct ether_addr *addr1)
 {
-    assert(num <= ETH_ALEN);
-    for (int i = 0; i < num; i++) {
+    for (int i = 0; i < ETH_ALEN; i++) {
         if (addr0->ether_addr_octet[i] != addr1->ether_addr_octet[i]) {
             return false;
         }
     }
     return true;
 }
 
-static inline bool
-mac802_addr_eq(struct ether_addr *addr0,
-               struct ether_addr *addr1)
-{
-    mac802_addr_eq_num(addr0, addr1, ETH_ALEN);
-}
-
 static inline bool
 mac802_addr_eq_bcast(struct ether_addr *addr)
 {
     return mac802_addr_eq(addr, &bcast_macaddr);
 }
 
-static inline bool
-mac802_addr_eq_ipv6_mcast(struct ether_addr *addr)
-{
-    return mac802_addr_eq_num(addr, &ipv6_multicast_macaddr, 2);
-}
-
 typedef struct vswitch_node_ {
     struct ether_addr addr;
     vswitch_virtqueues_t virtqueues;

libusbdrivers/CMakeLists.txt

@@ -18,10 +18,6 @@ struct ether_addr bcast_macaddr = { .ether_addr_octet = {
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
     }
 };
-struct ether_addr ipv6_multicast_macaddr = { .ether_addr_octet = {
-        0x33, 0x33, 0x0, 0x0, 0x0, 0x0
-    }
-};
 
 static int vswitch_find_free_slot(vswitch_t *lib)
 {