]> rtime.felk.cvut.cz Git - hydro.git/commitdiff
File with changes in uldy_base.c
authorstefic User <stefic@ubuntu.ubuntu-domain>
Mon, 24 Nov 2008 19:38:14 +0000 (20:38 +0100)
committerstefic User <stefic@ubuntu.ubuntu-domain>
Mon, 24 Nov 2008 19:38:14 +0000 (20:38 +0100)
hydro.diff [new file with mode: 0644]

diff --git a/hydro.diff b/hydro.diff
new file mode 100644 (file)
index 0000000..037a21e
--- /dev/null
@@ -0,0 +1,61 @@
+? hydro.diff
+? embedded/hydro
+? embedded/pikron
+Index: embedded/libs4c/ulan/uldy/uldy_base.c
+===================================================================
+RCS file: /cvsroot/ulan/ulan/embedded/libs4c/ulan/uldy/uldy_base.c,v
+retrieving revision 1.4
+diff -u -r1.4 uldy_base.c
+--- embedded/libs4c/ulan/uldy/uldy_base.c      19 Jan 2008 00:21:28 -0000      1.4
++++ embedded/libs4c/ulan/uldy/uldy_base.c      6 Nov 2008 13:13:30 -0000
+@@ -1,13 +1,10 @@
+-#include <system_def.h>
+-#include <cpu_def.h>
++//#include <system_def.h>
++//#include <cpu_def.h>
+ #include <uldy_base.h>
+ #ifdef UL_WITHOUT_HANDLE
+ #include "ul_drv_fnc.h"
+ #endif
+-#ifdef CONFIG_OC_UL_DRV_SYSLESS
+ #include <string.h>
+-#endif
+-
+ void
+ ul_dy_sn2buf(uchar *buf,unsigned long mod_sn)
+Index: embedded/libs4c/ulan/uldy/uldy_base.h
+===================================================================
+RCS file: /cvsroot/ulan/ulan/embedded/libs4c/ulan/uldy/uldy_base.h,v
+retrieving revision 1.3
+diff -u -r1.3 uldy_base.h
+--- embedded/libs4c/ulan/uldy/uldy_base.h      28 Sep 2006 00:01:31 -0000      1.3
++++ embedded/libs4c/ulan/uldy/uldy_base.h      6 Nov 2008 13:13:30 -0000
+@@ -20,6 +20,7 @@
+   extern ul_idstr_t CODE ul_idstr;
+ #else
+   #define UL_DYAC_VAR_LOC
++ #include <types.h>
+ #endif
+ #ifdef SDCC
+@@ -38,7 +39,7 @@
+   char *ul_idstr;
+   uint8_t ul_idstr_len;
+   char boot_activated;
+- #ifdef CONFIG_OC_UL_DRV_SYSLESS
++ #ifndef UL_WITHOUT_HANDLE //CONFIG_OC_UL_DRV_SYSLESS
+   ul_fd_t ul_fd;
+   uint8_t ul_dysa;
+   uint8_t ul_fld;
+Index: host/Makefile.omk
+===================================================================
+RCS file: /cvsroot/ulan/ulan/host/Makefile.omk,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.omk
+--- host/Makefile.omk  11 Nov 2007 18:35:38 -0000      1.4
++++ host/Makefile.omk  6 Nov 2008 13:13:30 -0000
+@@ -1 +1,2 @@
+-SUBDIRS = libs4c ul_drv apps
++SUBDIRS = libs4c ul_drv apps uloi_lt
++