From: martyy <triska@unipi.technology>
Date: Sun, 1 Mar 2020 18:10:27 +0000 (+0100)
Subject: Resolved merge conflicts
X-Git-Url: http://git.graph-it.com/?a=commitdiff_plain;h=7c97fdd9883f453a9db6963c22b755f592d779b4;p=graphit%2Funipi-kernel.git

Resolved merge conflicts
---

7c97fdd9883f453a9db6963c22b755f592d779b4
diff --cc Makefile
index da6311c,bcf526f..7542628
--- a/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  # Note: Compiling kernel modules requires creating symlinks, which is not possible on certain 
  # filesystems (notably VirtualBox vmfs); therefore we allow using /run/ through the 'symlink' target,
  # if necessary.
-- 
++
  MODULES_DIR_PATH = ${PWD}/modules/
  MODULES_LIST = unipi/ rtc-unipi/
  
@@@ -9,24 -9,24 +9,24 @@@
  #default: symlink ;
  default: all ;
  
--all: 
++all:
  	for m in ${MODULES_LIST}; do\
  		cd ${MODULES_DIR_PATH}$$m; make all || exit 1;\
  		done
  
  modules_install: install ;
  
--install: 
++install:
  	for m in ${MODULES_LIST}; do\
  		cd ${MODULES_DIR_PATH}$$m; make modules_install INSTALL_MOD_PATH=${DESTDIR} || exit 1;\
  		done
  
  dkms:
  	for m in ${MODULES_LIST}; do\
 -		cd ${MODULES_DIR_PATH}$$m; make dkms INSTALL_MOD_PATH=${DESTDIR}/$$m  || exit 1;\
 +		cd ${MODULES_DIR_PATH}$$m; make dkms INSTALL_MOD_PATH=${DESTDIR}/$$m || exit 1;\
  		done
  
--clean: 
++clean:
  	for m in ${MODULES_LIST}; do\
  		cd ${MODULES_DIR_PATH}$$m; make clean;\
  		done
diff --cc modules/unipi/src/unipi_uart.c
index 0facb35,f86b2db..3c87c23
--- a/modules/unipi/src/unipi_uart.c
+++ b/modules/unipi/src/unipi_uart.c
@@@ -311,16 -338,18 +338,17 @@@ void neuronspi_uart_handle_rx(struct ne
  
  	if (rxlen) {
  		spin_lock_irqsave(&port->port.lock, flags);
- 		port->port.icount.rx++;
- 		flag = TTY_NORMAL;
- 		for (i = 0; i < rxlen; ++i) {
- 
- 			ch = *pbuf;
-             pbuf++;
- 			if (uart_handle_sysrq_char(&port->port, ch))
- 				continue;
- 
- 			uart_insert_char(&port->port, 0, 0, ch, flag);
+ 		if (port->accept_rx) {
+ 			port->port.icount.rx++;
+ 			flag = TTY_NORMAL;
+ 			for (i = 0; i < rxlen; ++i) {
 -
+ 				ch = *pbuf;
 -            	pbuf++;
++            			pbuf++;
+ 				if (uart_handle_sysrq_char(&port->port, ch))
+ 					continue;
+ 
+ 				uart_insert_char(&port->port, 0, 0, ch, flag);
+ 			}
  		}
  		spin_unlock_irqrestore(&port->port.lock, flags);
  	}