X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Ftriface%2Ftriface.c;h=86f21b2d22fb806dd4c96a8def5a8b07acd22137;hb=656eb15bf18229f44f671a75a12ea7a2fb88edc5;hp=270619bcc666f8dd5d7b21e00c655e0c58609d49;hpb=a9ab2dc002e9b0ff91cb3f74c3ad3aa3676b84b1;p=bertos.git diff --git a/app/triface/triface.c b/app/triface/triface.c index 270619bc..86f21b2d 100644 --- a/app/triface/triface.c +++ b/app/triface/triface.c @@ -27,14 +27,14 @@ * the GNU General Public License. * * Copyright 2003, 2004, 2006, 2008 Develer S.r.l. (http://www.develer.com/) - * Copyright 2000 Bernardo Innocenti + * Copyright 2000 Bernie Innocenti * * --> * * \version $Id$ * * \author Marco Benelli - * \author Bernardo Innocenti + * \author Bernie Innocenti * \author Daniele Basile * * \brief Windowing system test. @@ -58,7 +58,8 @@ -static KFileSerial fd_ser; +static Serial fd_ser; +static Serial tag_ser; int main(void) { @@ -80,11 +81,10 @@ int main(void) ser_init(&fd_ser, CONFIG_TRIFACE_PORT); ser_setbaudrate(&fd_ser, CONFIG_TRIFACE_BAUDRATE); - ser_init(pkt.tag_ser, TAG_SER_PORT); - ser_setbaudrate(pkt.tag_ser, TAG_SER_BAUDRATE); + ser_init(&tag_ser, TAG_SER_PORT); + ser_setbaudrate(&tag_ser, TAG_SER_BAUDRATE); - pkt.comm_ser = &fd_ser; - keytag_init(&pkt); + keytag_init(&pkt, &fd_ser.fd, &tag_ser.fd); protocol_init(&fd_ser.fd);