Minor refactoring

diff --git a/misc/raspbian b/misc/raspbian
new file mode 100644 (file)
index 0000000..6f1839a
--- /dev/null
+++ b/misc/raspbian
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+mkdir -p tmp
+wget -q http://archive.raspberrypi.org/debian/dists/stretch/main/binary-armhf/Packages.gz -O - | gunzip \
+| awk '/^Package: raspberrypi-kernel-headers[[:blank:]]*$/ { ok=1; next} /^Package: / {ok=0;} (ok!=1) {next} 
+/^Version: / {print "RPI_FIRMWARE_VER=" $2 } 
+/^Filename: / {print "RPI_FIRMWARE_FILE=" $2; nextfile }' > tmp/versions
+
+cd tmp
+. versions
+
+wget https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_${RPI_FIRMWARE_VER}.zip
+
+unzip raspberrypi-kernel_${RPI_FIRMWARE_VER}.zip
+rm raspberrypi-kernel_${RPI_FIRMWARE_VER}.zip
+
+wget http://archive.raspberrypi.org/debian/${RPI_FIRMWARE_FILE}
+dpkg-deb -x raspberrypi-kernel-headers_1.20180417-1_armhf.deb h
+KERNEL_VER=`ls -1 h/lib/modules | grep '\-v7'`
+echo $KERNEL_VER
+cp h/usr/src/linux-headers-${KERNEL_VER}/.config linux-raspberrypi-kernel_${RPI_FIRMWARE_VER}
+cp h/usr/src/linux-headers-${KERNEL_VER}/Module.symvers linux-raspberrypi-kernel_${RPI_FIRMWARE_VER}
+cd linux-raspberrypi-kernel_${RPI_FIRMWARE_VER}
+make modules_prepare CROSS_COMPILE=arm-linux-gnueabi- ARCH=arm
+cd ../..
+make all CCPREFIX=arm-linux-gnueabi- ARCH=arm LINUX_DIR_PATH=tmp/linux-raspberrypi-kernel_${RPI_FIRMWARE_VER}

diff --git a/modules/unipi/src/unipi_spi.c b/modules/unipi/src/unipi_spi.c
index 8812f3a5c3f1ccb1a7cc46b2a6c3629f248885d2..9ce6769e0e4db3519047c78642d4984d62e7f611 100644 (file)
--- a/modules/unipi/src/unipi_spi.c
+++ b/modules/unipi/src/unipi_spi.c
@@ -62,13 +62,13 @@ struct neuronspi_char_driver neuronspi_cdrv =
 
 struct mutex neuronspi_master_mutex;
 struct mutex unipi_inv_speed_mutex;
-struct spinlock* neuronspi_ldisc_spinlock;
-struct spinlock* neuronspi_spi_w_spinlock;
+struct spinlock *neuronspi_ldisc_spinlock;
+struct spinlock *neuronspi_spi_w_spinlock;
 u8 neuronspi_spi_w_flag = 1;
 u8 neuronspi_probe_count = 0;
 int neuronspi_model_id = -1;
 spinlock_t neuronspi_probe_spinlock;
-struct spi_device* neuronspi_s_dev[NEURONSPI_MAX_DEVS];
+struct spi_device *neuronspi_s_dev[NEURONSPI_MAX_DEVS];
 struct task_struct *neuronspi_invalidate_thread;
 
 struct sched_param neuronspi_sched_param = { .sched_priority = MAX_RT_PRIO / 2 };

diff --git a/modules/unipi/src/unipi_sysfs.c b/modules/unipi/src/unipi_sysfs.c
index fe2fcb914d1972ab6c3d6d06d374e4fb3896edfb..ff49a1f90bf6489ed7e9c86a52f259e250048833 100644 (file)
--- a/modules/unipi/src/unipi_sysfs.c
+++ b/modules/unipi/src/unipi_sysfs.c
@@ -991,7 +991,7 @@ static ssize_t neuronspi_spi_gpio_show_ro_count(struct device *dev, struct devic
 }
 
 
-static ssize_t neuronspi_iio_show_primary_ai_mode(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t neuronspi_iio_show_stm_ai_mode(struct device *dev, struct device_attribute *attr, char *buf)
 {
        int ret = 0;
        unsigned int val = 0;
@@ -1004,7 +1004,7 @@ static ssize_t neuronspi_iio_show_primary_ai_mode(struct device *dev, struct dev
        return ret;
 }
 
-static ssize_t neuronspi_iio_store_primary_ai_mode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t neuronspi_iio_store_stm_ai_mode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
        ssize_t err = 0;
        unsigned int val = 0;
@@ -1021,7 +1021,7 @@ err_end:
        return count;
 }
 
-static ssize_t neuronspi_iio_show_primary_ao_mode(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t neuronspi_iio_show_stm_ao_mode(struct device *dev, struct device_attribute *attr, char *buf)
 {
        int ret = 0;
        unsigned int val = 0;
@@ -1034,7 +1034,7 @@ static ssize_t neuronspi_iio_show_primary_ao_mode(struct device *dev, struct dev
        return ret;
 }
 
-static ssize_t neuronspi_iio_store_primary_ao_mode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t neuronspi_iio_store_stm_ao_mode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
        ssize_t err = 0;
        unsigned int val = 0;
@@ -1051,7 +1051,7 @@ err_end:
        return count;
 }
 
-static ssize_t neuronspi_iio_show_secondary_ai_mode(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t neuronspi_iio_show_external_ai_mode(struct device *dev, struct device_attribute *attr, char *buf)
 {
        int ret = 0;
        unsigned int val = 0;
@@ -1063,7 +1063,7 @@ static ssize_t neuronspi_iio_show_secondary_ai_mode(struct device *dev, struct d
        ret = scnprintf(buf, 255, "%d\n", val);
        return ret;
 }
-static ssize_t neuronspi_iio_store_secondary_ai_mode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t neuronspi_iio_store_external_ai_mode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
        ssize_t err = 0;
        unsigned int val = 0;
@@ -1079,7 +1079,7 @@ static ssize_t neuronspi_iio_store_secondary_ai_mode(struct device *dev, struct
 err_end:
        return count;
 }
-static ssize_t neuronspi_iio_show_secondary_ao_mode(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t neuronspi_iio_show_external_ao_mode(struct device *dev, struct device_attribute *attr, char *buf)
 {
        int ret = 0;
        unsigned int val = 0;
@@ -1091,7 +1091,7 @@ static ssize_t neuronspi_iio_show_secondary_ao_mode(struct device *dev, struct d
        ret = scnprintf(buf, 255, "%d\n", val);
        return ret;
 }
-static ssize_t neuronspi_iio_store_secondary_ao_mode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t neuronspi_iio_store_external_ao_mode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
        ssize_t err = 0;
        unsigned int val = 0;
@@ -1152,10 +1152,10 @@ static DEVICE_ATTR(sys_gpio_di_base, 0440, neuronspi_spi_gpio_show_di_base, NULL
 static DEVICE_ATTR(sys_gpio_ro_count, 0440, neuronspi_spi_gpio_show_ro_count, NULL);
 static DEVICE_ATTR(sys_gpio_ro_prefix, 0440, neuronspi_spi_gpio_show_ro_prefix, NULL);
 static DEVICE_ATTR(sys_gpio_ro_base, 0440, neuronspi_spi_gpio_show_ro_base, NULL);
-static DEVICE_ATTR(mode_ai_type_a, 0660, neuronspi_iio_show_primary_ai_mode, neuronspi_iio_store_primary_ai_mode);
-static DEVICE_ATTR(mode_ao_type_a, 0660, neuronspi_iio_show_primary_ao_mode, neuronspi_iio_store_primary_ao_mode);
-static DEVICE_ATTR(mode_ai_type_b, 0660, neuronspi_iio_show_secondary_ai_mode, neuronspi_iio_store_secondary_ai_mode);
-static DEVICE_ATTR(mode_ao_type_b, 0660, neuronspi_iio_show_secondary_ao_mode, neuronspi_iio_store_secondary_ao_mode);
+static DEVICE_ATTR(mode_ai_type_a, 0660, neuronspi_iio_show_stm_ai_mode, neuronspi_iio_store_stm_ai_mode);
+static DEVICE_ATTR(mode_ao_type_a, 0660, neuronspi_iio_show_stm_ao_mode, neuronspi_iio_store_stm_ao_mode);
+static DEVICE_ATTR(mode_ai_type_b, 0660, neuronspi_iio_show_external_ai_mode, neuronspi_iio_store_external_ai_mode);
+static DEVICE_ATTR(mode_ao_type_b, 0660, neuronspi_iio_show_external_ao_mode, neuronspi_iio_store_external_ao_mode);
 
 static struct attribute *neuron_plc_attrs[] = {
                &dev_attr_model_name.attr,

diff --git a/modules/unipi/src/unipi_tty.c b/modules/unipi/src/unipi_tty.c
index 6b238263002cdea36bc66ab373400fa082902204..65698be166988bb3fbe464d6cfafad25bd1ac777 100644 (file)
--- a/modules/unipi/src/unipi_tty.c
+++ b/modules/unipi/src/unipi_tty.c
@@ -20,7 +20,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 
-static struct tty_ldisc_ops neuronspi_tty_ldisc;
+struct tty_ldisc_ops neuronspi_tty_ldisc;
 
 int neuronspi_tty_init()
 {

diff --git a/version.txt b/version.txt
index b624a65d5d94af212fc4e1299c4a5bd31dda8fd1..8dd7e340886b543cf31938cc843ac28b30d9c013 100644 (file)
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:57(b6cfcc0) LatestCommit:Tue Jun 26 14:14:56 CEST 2018
+Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:58(71469f7) LatestCommit:Wed Jun 27 13:25:42 CEST 2018