From: Tom Knot <tomasknot@gmail.com>
Date: Thu, 14 Jun 2018 09:44:06 +0000 (+0200)
Subject: Swapped IOCTL order and changed per-char divider
X-Git-Url: http://git.graph-it.com/?a=commitdiff_plain;h=04e9aea682a35478d01d91c5e684d8b5ad48d77e;p=graphit%2Funipi-kernel.git

Swapped IOCTL order and changed per-char divider
---

diff --git a/modules/unipi/src/unipi_uart.c b/modules/unipi/src/unipi_uart.c
index ed363c7..0e708ef 100644
--- a/modules/unipi/src/unipi_uart.c
+++ b/modules/unipi/src/unipi_uart.c
@@ -114,23 +114,23 @@ int	neuronspi_uart_ioctl (struct uart_port *port, unsigned int ioctl_code, unsig
 #endif
 		return 1;
 	}
-	case 0x5480: {
+	case 0x5481: {
 //#if NEURONSPI_DETAILED_DEBUG > 0
-		printk(KERN_INFO "NEURONSPI: IOCTL 0x5480\n");
+		printk(KERN_INFO "NEURONSPI: IOCTL 0x5481\n");
 //#endif
 		write_length = neuronspi_spi_compose_single_register_write(NEURONSPI_UART_TIMEOUT_REGISTER, &inp_buf, &outp_buf, (ioctl_arg * 1000000) / n_port->baud);
-		printk(KERN_INFO "NEURONSPI: val_upper: %x, val_lower: %x", outp_buf[10], outp_buf[11]);
+		printk(KERN_INFO "NEURONSPI: val_upper: %x, val_lower: %x", inp_buf[10], inp_buf[11]);
 		neuronspi_spi_send_message(spi, inp_buf, outp_buf, write_length, n_spi->ideal_frequency, 25, 1, 0);
-
 		kfree(inp_buf);
 		kfree(outp_buf);
 		return 0;
 	}
-	case 0x5481: {
-#if NEURONSPI_DETAILED_DEBUG > 0
-		printk(KERN_INFO "NEURONSPI: IOCTL 0x5481\n");
-#endif
-		write_length = neuronspi_spi_compose_single_register_write(NEURONSPI_UART_TIMEOUT_REGISTER, &inp_buf, &outp_buf, ioctl_arg);
+	case 0x5480: {
+//#if NEURONSPI_DETAILED_DEBUG > 0
+		printk(KERN_INFO "NEURONSPI: IOCTL 0x5480\n");
+//#endif
+		write_length = neuronspi_spi_compose_single_register_write(NEURONSPI_UART_TIMEOUT_REGISTER, &inp_buf, &outp_buf, ioctl_arg * 10);
+		printk(KERN_INFO "NEURONSPI: val_upper: %x, val_lower: %x", inp_buf[10], inp_buf[11]);
 		neuronspi_spi_send_message(spi, inp_buf, outp_buf, write_length, n_spi->ideal_frequency, 25, 1, 0);
 		kfree(inp_buf);
 		kfree(outp_buf);
diff --git a/version.txt b/version.txt
index 91bb6e5..9c22272 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-Repository:neuron-kernel ActiveBranch:[master] PrecedingRelease:v.0.10 PrecedingRevision:40(31707cd) LatestCommit:Thu Jun 14 11:22:02 CEST 2018
+Repository:neuron-kernel ActiveBranch:[master] PrecedingRelease:v.0.10 PrecedingRevision:42(f4c711b) LatestCommit:Thu Jun 14 12:00:04 CEST 2018