uloi_com: partly fixed compilation for MCS51

Signed-off-by: Petr Smolik <petr@smoliku.cz>

diff --git a/arch/mcs51/generic/libs/ulan/ul_l_c2a.c b/arch/mcs51/generic/libs/ulan/ul_l_c2a.c
index 04e6c91282dc07beda0d113e3e70d33956efcb5a..312a1e1929d4936c568dc38390d11d76e2abf02c 100644 (file)
--- a/arch/mcs51/generic/libs/ulan/ul_l_c2a.c
+++ b/arch/mcs51/generic/libs/ulan/ul_l_c2a.c
@@ -919,18 +919,6 @@ int ul_fd_wait(ul_fd_t ul_fd, int wait_sec)
   return 0;
 }
 
-int __uloi_con_ulan_set_cmd_fd(uloi_coninfo_t *coninfo, int cmd)
-{
-  uloi_con_ulan_t *con_ulan = UL_CONTAINEROF(coninfo, uloi_con_ulan_t, con);
-  if(!cmd)
-    cmd=UL_CMD_OISV;
-  con_ulan->cmd=cmd;
-  con_ulan->sn=0;
-  con_ulan->bsn=0;
-  return 0;
-}
-
-
 #if 0
 int test_fnc(int i)
 {

diff --git a/arch/mcs51/generic/libs/ulan/ulan.h b/arch/mcs51/generic/libs/ulan/ulan.h
index 967055cde8b4b1311d71c1356e39fbe40c215f44..68af65818d39642eee5e0e7827c88b4ae9a79445 100644 (file)
--- a/arch/mcs51/generic/libs/ulan/ulan.h
+++ b/arch/mcs51/generic/libs/ulan/ulan.h
@@ -176,55 +176,6 @@ int ul_send_query_wait(ul_fd_t ul_fd,int dadr,int cmd,int flg,
 #define UL_CMD_NCS     0x7f    /* Network Control Service */
 #define UL_CMD_GST     0xc1    /* Fast module get status */
 
-/* definitions of basic uLan OI commands */
-
-#define ULOI_AOID   10 /* name is defined in ASCII for DOIx */
-#define ULOI_DOII   12 /* description of input objects */
-#define ULOI_DOIO   14 /* description of output objects */
-#define ULOI_QOII   16 /* ID numbers of recognized input objects */
-#define ULOI_QOIO   18 /* ID numbers of recognized output objects */
-#define ULOI_RDRQ   20 /* object values read request */
-#define ULOI_STATUS 30 /* read instrument status */
-#define ULOI_ERRCLR 31 /* clear error status */
-
-typedef struct uloi_coninfo_t {
-  uchar error; /* error condition occurred */
-  uchar state; /* internal state */
-  int array_idx;/* array index */
-} uloi_coninfo_t;
-
-typedef struct uloi_con_ulan_t {
-  uloi_coninfo_t con;
-  uchar adr;   /* address of target module */
-  uchar cmd;   /* service/cmd number for uLOI on target */
-  uchar bcmd;  /* service/cmd number for returned messages */
-  uchar sn;    /* sequence counter */
-  uchar bsn;   /* sequence counter of target module */
-  uchar outflg;        /* flags used for outgoing messages */
-  ul_fd_t rdfd;/* handle for ul_drv */
-  ul_fd_t wrfd;/* the auxiliary handle for ULOI direct reply */
-  int timeout; /* timeout */
-} uloi_con_ulan_t;
-
-int __uloi_con_ulan_set_cmd_fd(uloi_coninfo_t *coninfo, int cmd);
-#define uloi_con_ulan_set_cmd_fd(ci, cmd, rdfd, wrfd) __uloi_con_ulan_set_cmd_fd(ci, cmd)
-
-/* definitions of basic uLan OI functions */
-
-uloi_coninfo_t* uloi_open(char *ul_dev_name,int adr,int cmd,
-                       int bcmd, int timeout);
-void uloi_close(uloi_coninfo_t *coninfo);
-int uloi_transfer(uloi_coninfo_t *coninfo,
-                 uchar *bufin,int lenin,uchar **bufout,int *lenout);
-int uloi_set_var(uloi_coninfo_t *coninfo,int oid, void *val, int size);
-int uloi_get_var(uloi_coninfo_t *coninfo,int oid, void *val, int size);
-int uloi_set_var_u2(uloi_coninfo_t *coninfo,int oid,unsigned val);
-int uloi_get_var_u2(uloi_coninfo_t *coninfo,int oid,unsigned *val);
-int uloi_send_cmd(uloi_coninfo_t *coninfo,int oid);
-int uloi_get_oids(uloi_coninfo_t *coninfo,int list,int **oids_list);
-int uloi_get_oiddes(uloi_coninfo_t *coninfo,int list, int oid);
-int uloi_get_aoiddes(uloi_coninfo_t *coninfo,int list,char *aoid);
-
 /* UL_CMD_NCS  Network Control Service */
 
 #define ULNCS_ADR_RQ     0xC0    /* SN0 SN1 SN2 SN3 */

diff --git a/board/mcs51/ulad21/config/config.u2u b/board/mcs51/ulad21/config/config.u2u
index 4517036ae74876f9249e5f50af87de6b01cd0fc5..8af343093c14099258be4cb60eaf355ca34830de 100644 (file)
--- a/board/mcs51/ulad21/config/config.u2u
+++ b/board/mcs51/ulad21/config/config.u2u
@@ -16,6 +16,9 @@ CONFIG_ULAN=y
 CONFIG_MISC_VECT=y
 CONFIG_USB_BASE=y
 CONFIG_USB_PDIUSB=y
+CONFIG_UL_LIB=n
+CONFIG_OC_ULUT=n
+CONFIG_ULOI_COM=n
 
 #CFLAGS += -DUSB_VENDOR_ID=0x1669 -DUSB_PRODUCT_ID=0x1001