projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to new name.
[bertos.git]
/
app
/
triface
/
triface.c
diff --git
a/app/triface/triface.c
b/app/triface/triface.c
index eb47d8fad0f5c67f77c31de895c0d67ff506b62b..86f21b2d22fb806dd4c96a8def5a8b07acd22137 100644
(file)
--- a/
app/triface/triface.c
+++ b/
app/triface/triface.c
@@
-27,35
+27,39
@@
* the GNU General Public License.
*
* Copyright 2003, 2004, 2006, 2008 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2003, 2004, 2006, 2008 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bern
ardo
Innocenti <bernie@codewiz.org>
+ * Copyright 2000 Bern
ie
Innocenti <bernie@codewiz.org>
*
* -->
*
* \version $Id$
*
* \author Marco Benelli <marco@develer.com>
*
* -->
*
* \version $Id$
*
* \author Marco Benelli <marco@develer.com>
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
* \author Daniele Basile <asterix@develer.com>
*
* \brief Windowing system test.
*/
* \author Daniele Basile <asterix@develer.com>
*
* \brief Windowing system test.
*/
+#include "protocol.h"
+#include "hw/hw_input.h"
+#include "hw/hw_adc.h"
+#include "cfg/cfg_ser.h"
+
+#include <cfg/macros.h>
+
#include <drv/timer.h>
#include <drv/buzzer.h>
#include <drv/ser.h>
#include <drv/sipo.h>
#include <drv/timer.h>
#include <drv/buzzer.h>
#include <drv/ser.h>
#include <drv/sipo.h>
-#include <cfg/macros.h>
#include <mware/parser.h>
#include <net/keytag.h>
#include <mware/parser.h>
#include <net/keytag.h>
-#include "protocol.h"
-#include "hw_input.h"
-#include "hw_adc.h"
-static KFileSerial fd_ser;
+static Serial fd_ser;
+static Serial tag_ser;
int main(void)
{
int main(void)
{
@@
-74,14
+78,13
@@
int main(void)
TagPacket pkt;
/* Open the main communication port */
TagPacket pkt;
/* Open the main communication port */
- ser_init(&fd_ser, CONFIG_
SER_HOST
PORT);
- ser_setbaudrate(&fd_ser, CONFIG_
SER_HOSTPORT
BAUDRATE);
+ 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);
protocol_init(&fd_ser.fd);