Merge pull request #5749 from ririyeye/master

fix linux-driver build err
xmake-io · Oct 23, 2024 · d3e46ba · d3e46ba
2 parents d60ca24 + fcf649a
commit d3e46ba
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 15 deletions.
diff --git a/tests/projects/linux/driver/hello/src/add.c b/tests/projects/linux/driver/hello/src/add.c
@@ -1,3 +1,4 @@
+#include "add.h"
 int add(int a, int b) {
     return a + b;
 }
diff --git a/tests/projects/linux/driver/hello/src/add.h b/tests/projects/linux/driver/hello/src/add.h
@@ -0,0 +1,2 @@
+#pragma once
+int add(int a, int b);
diff --git a/tests/projects/linux/driver/hello/src/hello.c b/tests/projects/linux/driver/hello/src/hello.c
@@ -1,20 +1,19 @@
 #include <linux/init.h>
 #include <linux/module.h>
+#include "add.h"
 
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Ruki");
 MODULE_DESCRIPTION("A simple Hello World Module");
 MODULE_ALIAS("a simplest module");
 
-int add(int a, int b);
-
-int hello_init(void)
+static int hello_init(void)
 {
     printk(KERN_INFO "Hello World: %d\n", add(1, 2));
     return 0;
 }
 
-void hello_exit(void)
+static void hello_exit(void)
 {
     printk(KERN_INFO "Goodbye World\n");
 }

diff --git a/tests/projects/linux/driver/hello_custom/src/add.c b/tests/projects/linux/driver/hello_custom/src/add.c
@@ -1,3 +1,4 @@
+#include "add.h"
 int add(int a, int b) {
     return a + b;
 }
diff --git a/tests/projects/linux/driver/hello_custom/src/add.h b/tests/projects/linux/driver/hello_custom/src/add.h
@@ -0,0 +1,2 @@
+#pragma once
+int add(int a, int b);
diff --git a/tests/projects/linux/driver/hello_custom/src/hello.c b/tests/projects/linux/driver/hello_custom/src/hello.c
@@ -1,20 +1,18 @@
 #include <linux/init.h>
 #include <linux/module.h>
-
+#include "add.h"
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Ruki");
 MODULE_DESCRIPTION("A simple Hello World Module");
 MODULE_ALIAS("a simplest module");
 
-int add(int a, int b);
-
-int hello_init(void)
+static int hello_init(void)
 {
     printk(KERN_INFO "Hello World: %d\n", add(1, 2));
     return 0;
 }
 
-void hello_exit(void)
+static void hello_exit(void)
 {
     printk(KERN_INFO "Goodbye World\n");
 }

diff --git a/tests/projects/linux/driver/hello_makefile/src/add.c b/tests/projects/linux/driver/hello_makefile/src/add.c
@@ -1,3 +1,4 @@
+#include "add.h"
 int add(int a, int b) {
     return a + b;
 }
diff --git a/tests/projects/linux/driver/hello_makefile/src/add.h b/tests/projects/linux/driver/hello_makefile/src/add.h
@@ -0,0 +1,2 @@
+#pragma once
+int add(int a, int b);
diff --git a/tests/projects/linux/driver/hello_makefile/src/hello.c b/tests/projects/linux/driver/hello_makefile/src/hello.c
@@ -1,20 +1,19 @@
 #include <linux/init.h>
 #include <linux/module.h>
+#include "add.h"
 
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Ruki");
 MODULE_DESCRIPTION("A simple Hello World Module");
 MODULE_ALIAS("a simplest module");
 
-int add(int a, int b);
-
-int hello_init(void)
+static int hello_init(void)
 {
     printk(KERN_INFO "Hello World: %d\n", add(1, 2));
     return 0;
 }
 
-void hello_exit(void)
+static void hello_exit(void)
 {
     printk(KERN_INFO "Goodbye World\n");
 }

diff --git a/xmake/rules/platform/linux/driver/driver_modules.lua b/xmake/rules/platform/linux/driver/driver_modules.lua
@@ -75,12 +75,12 @@ MODULE_AUTHOR("Ruki");
 MODULE_DESCRIPTION("A simple Hello World Module");
 MODULE_ALIAS("a simplest module");
 
-int hello_init(void) {
+static int hello_init(void) {
     printk(KERN_INFO "Hello World\n");
     return 0;
 }
 
-void hello_exit(void) {
+static void hello_exit(void) {
     printk(KERN_INFO "Goodbye World\n");
 }