fixup! macos: DriverKit core backend

SamsungDS · May 13, 2024 · 1c7ebbd · 1c7ebbd
1 parent 8c51fc0
commit 1c7ebbd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/include/vfn/driverkit/pci.h b/include/vfn/driverkit/pci.h
@@ -7,8 +7,8 @@
 
 // NOTE: Dummy PROT to satisfy Linux code
 enum {
-    PROT_READ=0,
-    PROT_WRITE=1,
+	PROT_READ = 0,
+	PROT_WRITE = 1,
 };
 
 // NOTE: Faux open for macOS
@@ -28,7 +28,7 @@ int vfio_pci_open(struct driverkit_pci_device *pci, const char *bdf);
  * returns ``NULL`` and sets ``errno``.
  */
 void *vfio_pci_map_bar(struct driverkit_pci_device *pci, int idx, size_t len, uint64_t offset,
-		       int prot);
+			   int prot);
 
 /**
  * vfio_pci_unmap_bar - faux unmap a region in virtual memory for DriverKit

diff --git a/src/nvme/core.c b/src/nvme/core.c
@@ -32,28 +32,28 @@ int errno;
 #ifdef __APPLE__
 inline void *cqhdbl(void *doorbells, int qid, int dstrd)
 {
-    struct macvfn_pci_map_bar *doorbell_mapping = (struct macvfn_pci_map_bar*) doorbells;
-    struct macvfn_pci_map_bar *new_mapping = (struct macvfn_pci_map_bar*) zmallocn(1, sizeof(struct macvfn_pci_map_bar));
+	struct macvfn_pci_map_bar *doorbell_mapping = (struct macvfn_pci_map_bar*) doorbells;
+	struct macvfn_pci_map_bar *new_mapping = (struct macvfn_pci_map_bar*) zmallocn(1, sizeof(struct macvfn_pci_map_bar));
 
-    new_mapping->pci = doorbell_mapping->pci;
-    new_mapping->idx = doorbell_mapping->idx;
-    new_mapping->len = doorbell_mapping->len;
-    new_mapping->offset = doorbell_mapping->offset + (2 * qid + 1) * (4 << dstrd);
+	new_mapping->pci = doorbell_mapping->pci;
+	new_mapping->idx = doorbell_mapping->idx;
+	new_mapping->len = doorbell_mapping->len;
+	new_mapping->offset = doorbell_mapping->offset + (2 * qid + 1) * (4 << dstrd);
 
-    return new_mapping;
+	return new_mapping;
 }
 
 inline void *sqtdbl(void *doorbells, int qid, int dstrd)
 {
-    struct macvfn_pci_map_bar *doorbell_mapping = (struct macvfn_pci_map_bar*) doorbells;
-    struct macvfn_pci_map_bar *new_mapping = (struct macvfn_pci_map_bar*) zmallocn(1, sizeof(struct macvfn_pci_map_bar));
+	struct macvfn_pci_map_bar *doorbell_mapping = (struct macvfn_pci_map_bar*) doorbells;
+	struct macvfn_pci_map_bar *new_mapping = (struct macvfn_pci_map_bar*) zmallocn(1, sizeof(struct macvfn_pci_map_bar));
 
-    new_mapping->pci = doorbell_mapping->pci;
-    new_mapping->idx = doorbell_mapping->idx;
-    new_mapping->len = doorbell_mapping->len;
-    new_mapping->offset = doorbell_mapping->offset + (2 * qid) * (4 << dstrd);
+	new_mapping->pci = doorbell_mapping->pci;
+	new_mapping->idx = doorbell_mapping->idx;
+	new_mapping->len = doorbell_mapping->len;
+	new_mapping->offset = doorbell_mapping->offset + (2 * qid) * (4 << dstrd);
 
-    return new_mapping;
+	return new_mapping;
 }
 #else
 #define cqhdbl(doorbells, qid, dstrd) \

diff --git a/src/pci/util.c b/src/pci/util.c
@@ -29,11 +29,10 @@ extern "C" {
 #ifdef __APPLE__
 int pci_device_info_get_ull(const char *bdf, const char *prop, unsigned long long *v)
 {
-	if (!strcmp(prop, "class")){
-        // TODO: Actually read this from device once it makes sense
+	if (!strcmp(prop, "class")) {
+		// TODO: Actually read this from device once it makes sense
 		*v = 0x010800;
-	}
-	else{
+	} else {
 		return -1;
 	}
 	return 0;