projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start to merge old triface project in bertos, not working actually
[bertos.git]
/
app
/
triface
/
boot
/
main.c
diff --git
a/app/triface/boot/main.c
b/app/triface/boot/main.c
index 093a7f91d20955d749b7eb4a64176756076b7c11..85b7c9036841161be628ea752c2288ee8dc559f0 100644
(file)
--- a/
app/triface/boot/main.c
+++ b/
app/triface/boot/main.c
@@
-46,7
+46,7
@@
* \author Daniele Basile <asterix@develer.com>
*/
* \author Daniele Basile <asterix@develer.com>
*/
-#include <
mware
/xmodem.h>
+#include <
net
/xmodem.h>
#include <cfg/compiler.h>
#include <cfg/debug.h>
#include <cfg/macros.h> /* BV() */
#include <cfg/compiler.h>
#include <cfg/debug.h>
#include <cfg/macros.h> /* BV() */
@@
-57,12
+57,14
@@
#include <drv/flash_avr.h>
#include "hw/hw_boot.h"
#include <drv/flash_avr.h>
#include "hw/hw_boot.h"
+#include "cfg/cfg_boot.h"
#include <string.h>
int main(void)
{
KFile fd;
#include <string.h>
int main(void)
{
KFile fd;
+ KFileSerial ser;
// Set up flash programming functions.
// Set up flash programming functions.
@@
-74,13
+76,13
@@
int main(void)
kdbg_init();
timer_init();
kdbg_init();
timer_init();
- kprintf("Bertuccia");
/* Open the main communication port */
/* Open the main communication port */
-
Serial *host_port = ser_open(
CONFIG_SER_HOSTPORT);
- ser_setbaudrate(
host_port
, CONFIG_SER_HOSTPORTBAUDRATE);
+
ser_init(&ser,
CONFIG_SER_HOSTPORT);
+ ser_setbaudrate(
&ser
, CONFIG_SER_HOSTPORTBAUDRATE);
- xmodem_recv(host_port, &fd);
- fd.close(&fd);
+ xmodem_recv(&ser, &fd);
+ kfile_close(&fd);
+ kfile_close(&ser.fd);
IRQ_DISABLE;
IRQ_DISABLE;