projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark as TODO. Reformat.
[bertos.git]
/
app
/
triface
/
triface.c
diff --git
a/app/triface/triface.c
b/app/triface/triface.c
index 00c1a58025fa3ca2d1f0077c51ef553946598431..270619bcc666f8dd5d7b21e00c655e0c58609d49 100644
(file)
--- a/
app/triface/triface.c
+++ b/
app/triface/triface.c
@@
-26,7
+26,7
@@
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*
- * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2006
, 2008
Develer S.r.l. (http://www.develer.com/)
* Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
*
* -->
* Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
*
* -->
@@
-35,22
+35,30
@@
*
* \author Marco Benelli <marco@develer.com>
* \author Bernardo Innocenti <bernie@develer.com>
*
* \author Marco Benelli <marco@develer.com>
* \author Bernardo Innocenti <bernie@develer.com>
+ * \author Daniele Basile <asterix@develer.com>
*
* \brief Windowing system test.
*/
*
* \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/timer.h>
#include <drv/buzzer.h>
#include <drv/ser.h>
-#include <cfg/macros.h>
+#include <drv/sipo.h>
+
#include <mware/parser.h>
#include <net/keytag.h>
#include <mware/parser.h>
#include <net/keytag.h>
-#include <drv/sipo.h>
-#include "protocol.h"
-#include "hw_input.h"
-#include "hw_adc.h"
+
+
+static KFileSerial fd_ser;
int main(void)
{
int main(void)
{
@@
-69,24
+77,25
@@
int main(void)
TagPacket pkt;
/* Open the main communication port */
TagPacket pkt;
/* Open the main communication port */
-
Serial *host_port = ser_open(CONFIG_SER_HOST
PORT);
- ser_setbaudrate(
host_port, CONFIG_SER_HOSTPORT
BAUDRATE);
+
ser_init(&fd_ser, CONFIG_TRIFACE_
PORT);
+ ser_setbaudrate(
&fd_ser, CONFIG_TRIFACE_
BAUDRATE);
-
pkt.tag_ser = ser_open(
TAG_SER_PORT);
+
ser_init(pkt.tag_ser,
TAG_SER_PORT);
ser_setbaudrate(pkt.tag_ser, TAG_SER_BAUDRATE);
ser_setbaudrate(pkt.tag_ser, TAG_SER_BAUDRATE);
- pkt.comm_ser = host_port;
- keytag_init(&pkt);
-
+ pkt.comm_ser = &fd_ser;
+ keytag_init(&pkt);
- protocol_init(
host_port
);
+ protocol_init(
&fd_ser.fd
);
// Main loop
for(;;)
{
// Main loop
for(;;)
{
- protocol_run(
host_port
);
+ protocol_run(
&fd_ser.fd
);
keytag_poll(&pkt);
}
return 0;
}
keytag_poll(&pkt);
}
return 0;
}
+
+