Do not export unneeded functions + fix warning about implicit declaration of malloc()

diff --git a/mf624_SIMULINK.c b/mf624_SIMULINK.c
index a753753c68b676d4ded1639f0533a849d928dd10..51cca623ba87cb2456b20f042db59d70a4c9d00a 100644 (file)
--- a/mf624_SIMULINK.c
+++ b/mf624_SIMULINK.c
@@ -31,20 +31,19 @@
 #include <inttypes.h>
 #include <unistd.h>
 #include <alloca.h>
+#include <stdlib.h>
 
 #include "mf624_SIMULINK.h"
 
 /****************************************************************/
 
 
-#include "simstruc.h"
-
 /* Which uio device node to use */
 #define UIO "uio0"
 
 mf624_state_t* mfst=NULL;
 
-int bar_mapping_fill(bar_mapping_t *barmap, const char *uio_dev, int map_nr)
+static int bar_mapping_fill(bar_mapping_t *barmap, const char *uio_dev, int map_nr)
 {
        FILE *file;
        void *s;
@@ -88,7 +87,7 @@ int bar_mapping_fill(bar_mapping_t *barmap, const char *uio_dev, int map_nr)
        return 0;
 }
 
-int bar_mapping_setup(bar_mapping_t *barmap, int device_fd)
+static int bar_mapping_setup(bar_mapping_t *barmap, int device_fd)
 {
        static size_t page_mask = 0;
        off_t mmap_start;
@@ -125,7 +124,7 @@ int bar_mapping_setup(bar_mapping_t *barmap, int device_fd)
 mf624_state_t mf624_state;
 
 /* Print one byte as binary number */
-void print_8bin(int nr)
+static void print_8bin(int nr)
 {
        int i;
        for (i = 7; i >= 0; i--) {
@@ -204,7 +203,7 @@ double ADC_read(mf624_state_t* mfst, adc_channel_t channel)
 }
 
 
-int open_device(char* path) {
+static int open_device(char* path) {
        int device_fd;
 
        device_fd = open(path, O_RDWR | O_SYNC);
@@ -216,12 +215,12 @@ int open_device(char* path) {
        return device_fd;
 }
 
-void wait_for_interrupts(int device_fd)
+static void wait_for_interrupts(int device_fd)
 {
        read(device_fd, NULL, 1);
 }
 
-int disable_interrupts(int device_fd)
+static int disable_interrupts(int device_fd)
 {
        uint32_t control_value = 0;
        int status;
@@ -235,7 +234,7 @@ int disable_interrupts(int device_fd)
        return status;
 }
 
-int enable_interrupts(int device_fd)
+static int enable_interrupts(int device_fd)
 {
        uint32_t control_value = 1;
        int status;
@@ -249,7 +248,7 @@ int enable_interrupts(int device_fd)
        return status;
 }
 
-void list_available_mem_regions(char* device)
+static void list_available_mem_regions(char* device)
 {
        int status;
        char path[] = "/sys/class/uio/";
@@ -285,7 +284,7 @@ void list_available_mem_regions(char* device)
 }
 
 
-void list_available_io_ports(char *device)
+static void list_available_io_ports(char *device)
 {
        int status;
        char path[] = "/sys/class/uio/";
@@ -327,7 +326,7 @@ void list_available_io_ports(char *device)
 }
 
 
-void run_simple_tests(char* dev_name)
+static void run_simple_tests(char* dev_name)
 {
        int status;
        int device_fd;
@@ -362,7 +361,7 @@ void run_simple_tests(char* dev_name)
        list_available_io_ports(dev_name);
 }
 
-int mmap_regions(mf624_state_t* mfst)
+static int mmap_regions(mf624_state_t* mfst)
 {
        if (bar_mapping_fill(&mfst->bar0, mfst->uio_dev, 0) < 0) {
                fprintf(stderr, "%s bar0 mapping fill failed\n", mfst->uio_dev);

diff --git a/mf624_SIMULINK.h b/mf624_SIMULINK.h
index 55e5f3467d5baf231c77a9afbc9eaea807396d9d..4ee62b9f86fadb7f40c1dc28cf84bda56efed69d 100644 (file)
--- a/mf624_SIMULINK.h
+++ b/mf624_SIMULINK.h
@@ -5,6 +5,7 @@
 #include <stdint.h> // uintX_t
 #include <inttypes.h>
 
+#include "simstruc.h"
 
 /* Hardware specific */
 /* BAR0 */
@@ -103,8 +104,6 @@ static uint32_t adc_channel2reg[] = {
        [AD7] = ADDATA7_reg,
 };
 
-extern void print_8bin(int nr);
-
 static inline int16_t mf624_read16(void *ptr)
 {
        return *(volatile uint16_t*)ptr;
@@ -137,18 +136,6 @@ extern int ADC_enable(mf624_state_t* mfst, adc_channel_t channel);
 
 extern double ADC_read(mf624_state_t* mfst, adc_channel_t channel);
 
-extern int open_device(char* path);
-
-extern void wait_for_interrupts(int device_fd);
-
-extern int disable_interrupts(int device_fd);
-
-extern int enable_interrupts(int device_fd);
-
-extern void list_available_mem_regions(char* device);
-
-extern void list_available_io_ports(char *device);
-
-extern int mmap_regions(mf624_state_t* mfst);
+int mf624_init(SimStruct *S);
 
 #endif