hda: Fix device name

Qwinci · Oct 22, 2023 · 68a4e1c · 68a4e1c
1 parent 7c2530d
commit 68a4e1c
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 7 deletions.
diff --git a/src/dev/audio/hda/main.c b/src/dev/audio/hda/main.c
@@ -889,6 +889,8 @@ static void callback(void* ptr, usize len, void* userdata) {
 	sound_ptr = offset(sound_ptr, void*, len);
 }
 
+static int NUMBER = 0;
+
 static void hda_init(PciDev* dev) {
 	kprintf("hda init\n");
 
@@ -1012,7 +1014,7 @@ static void hda_init(PciDev* dev) {
 
 	kprintf("controller ready\n");
 
-	// todo
+	snprintf(self->snd_dev.generic.name, sizeof(self->snd_dev.generic.name), "hda#%d", NUMBER++);
 	memcpy(self->snd_dev.generic.name, "hda#unknown", sizeof("hda#unknown"));
 
 	self->snd_dev.create_stream = snd_create_stream;

diff --git a/src/dev/storage/CMakeLists.txt b/src/dev/storage/CMakeLists.txt
@@ -4,5 +4,3 @@ target_sources(crescent PRIVATE
 
         gpt.c
         )
-
-add_subdirectory(fs)
diff --git a/src/dev/storage/fs/CMakeLists.txt b/src/dev/storage/fs/CMakeLists.txt
diff --git a/src/dev/storage/gpt.c b/src/dev/storage/gpt.c
@@ -1,14 +1,14 @@
 #include "gpt.h"
 #include "assert.h"
-#include "dev/storage/fs/fat.h"
+#include "fs/fat.h"
 #include "mbr.h"
 #include "mem/allocator.h"
 #include "mem/utils.h"
 #include "storage.h"
 #include "string.h"
 #include "types.h"
 #include "utils/math.h"
-#include "dev/storage/fs/ext2.h"
+#include "fs/ext2.h"
 
 typedef struct {
 	char signature[8];

diff --git a/src/fs/CMakeLists.txt b/src/fs/CMakeLists.txt
@@ -1 +1 @@
-target_sources(crescent PRIVATE vfs.c tar.c)
+target_sources(crescent PRIVATE vfs.c tar.c ext2.c fat.c)
diff --git a/src/dev/storage/fs/ext2.c → src/fs/ext2.c b/src/dev/storage/fs/ext2.c → src/fs/ext2.c
diff --git a/src/dev/storage/fs/ext2.h → src/fs/ext2.h b/src/dev/storage/fs/ext2.h → src/fs/ext2.h
diff --git a/src/dev/storage/fs/fat.c → src/fs/fat.c b/src/dev/storage/fs/fat.c → src/fs/fat.c
diff --git a/src/dev/storage/fs/fat.h → src/fs/fat.h b/src/dev/storage/fs/fat.h → src/fs/fat.h