diff --git a/.gitignore b/.gitignore index 5c350e7..bb302dd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ *.mod.c *.o.cmd *.ko.cmd +*.mod.cmd +*.mod /module/Module.symvers /module/modules.order /module/.tmp_versions @@ -23,3 +25,16 @@ pts/tty0tty .settings .pydevproject +# debian packaging artifacts +debian/* +debhelper/* +files +*-dkms.debhelper.log +*-dkms.dkms.debhelper +*-dkms.postinst.debhelper +*-dkms.prerm.debhelper +*-dkms.substvars +*-dkms/* + +# vim temporary file +*.swp diff --git a/examples/tnt1_echo_tnt0.py b/examples/tnt1_echo_tnt0.py new file mode 100644 index 0000000..c765c59 --- /dev/null +++ b/examples/tnt1_echo_tnt0.py @@ -0,0 +1,17 @@ +import serial + +serialPort_tnt0 = serial.Serial(port = "/dev/tnt0", baudrate=115200, + bytesize=8, timeout=2, stopbits=serial.STOPBITS_ONE) +serialPort_tnt1 = serial.Serial(port = "/dev/tnt1", baudrate=115200, + bytesize=8, timeout=2, stopbits=serial.STOPBITS_ONE) +serialPort_tnt0.write(b"hello there \r\n") + +while(1): + # Wait until there is data waiting in the serial buffer + if(serialPort_tnt1.in_waiting > 0): + # Read data out of the buffer until a carraige return / new line is found + serialString = serialPort_tnt1.readline() + # Print the contents of the serial data + print(serialString.decode('Ascii')) + # exit + break diff --git a/module/tty0tty.c b/module/tty0tty.c index ab89793..de7d186 100644 --- a/module/tty0tty.c +++ b/module/tty0tty.c @@ -258,7 +258,7 @@ exit: return retval; } -static int tty0tty_write_room(struct tty_struct *tty) +static unsigned int tty0tty_write_room(struct tty_struct *tty) { struct tty0tty_serial *tty0tty = tty->driver_data; int room = 0; @@ -628,7 +628,7 @@ static int __init tty0tty_init(void) printk(KERN_DEBUG "%s - \n", __FUNCTION__); #endif /* allocate the tty driver */ - tty0tty_tty_driver = alloc_tty_driver(2 * pairs); + tty0tty_tty_driver = tty_alloc_driver(2 * pairs, 0); if (!tty0tty_tty_driver) return -ENOMEM; @@ -664,7 +664,7 @@ static int __init tty0tty_init(void) retval = tty_register_driver(tty0tty_tty_driver); if (retval) { printk(KERN_ERR "failed to register tty0tty tty driver"); - put_tty_driver(tty0tty_tty_driver); + tty_driver_kref_put(tty0tty_tty_driver); return retval; } diff --git a/pts/tty0tty.c b/pts/tty0tty.c index 22c526b..a3ce10b 100644 --- a/pts/tty0tty.c +++ b/pts/tty0tty.c @@ -32,7 +32,11 @@ #include #include +#ifdef __APPLE__ +#include +#else #include +#endif static char buffer[1024];