X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=uci.h;h=d47d1d57bd42446c9b85069fc8a74d1231ce8e35;hb=5b56e51eeae04c352b95b1706b9d69b61feba3e9;hp=5d28aa579fd2244e00a80b087dc8b8bec5715617;hpb=e7a2abd9bd4fce9ebbd70793b00d9d5f99886348;p=polyglot.git

diff --git a/uci.h b/uci.h
index 5d28aa5..d47d1d5 100644
--- a/uci.h
+++ b/uci.h
@@ -13,65 +13,75 @@
 #include "option.h"
 #include "util.h"
 
-// constants
-
-const int OptionNb = 256;
-
-struct uci_t {
-
-   engine_t * engine;
-
-   const char * name;
-   const char * author;
-
-   int option_nb;
-   option_t option[OptionNb];
-
-   bool ready;
-   int ready_nb;
-
-   bool searching;
-   int pending_nb;
-
-   board_t board[1];
-
-   int best_move;
-   int ponder_move;
-
-   int score;
-   int depth;
-   int sel_depth;
-   move_t pv[LineSize];
-
-   int best_score;
-   int best_depth;
-   int best_sel_depth;
-   move_t best_pv[LineSize];
-
-   sint64 node_nb;
-   double time;
-   double speed;
-   double cpu;
-   double hash;
-   move_t current_line[LineSize];
-
-   int root_move;
-   int root_move_pos;
-   int root_move_nb;
-   bool multipv_mode;
-};
-
-enum dummy_event_t {
-   EVENT_NONE  = 0,
-   EVENT_UCI   = 1 << 0,
-   EVENT_READY = 1 << 1,
-   EVENT_STOP  = 1 << 2,
-   EVENT_MOVE  = 1 << 3,
-   EVENT_PV    = 1 << 4,
-   EVENT_DEPTH = 1 << 5,
-   EVENT_DRAW  = 1 << 6,
-   EVENT_RESIGN= 1 << 7
-};
+// macros
+
+// I need to make a uniform string type.
+
+#define UciStringSize 4096
+#define MultiPVStackSize 256
+
+// types
+
+typedef struct {
+  
+  engine_t * engine;
+  
+  const char * name;
+  const char * author;
+  
+  option_list_t option[1];
+  
+  bool ready;
+  int ready_nb;
+  
+  bool searching;
+  int pending_nb;
+  
+  board_t board[1];
+  
+  int best_move;
+  int ponder_move;
+  
+  int score;
+  int depth;
+  int sel_depth;
+  move_t pv[LineSize];
+  
+  int best_score;
+  int best_depth;
+  int best_sel_depth;
+  move_t best_pv[LineSize];
+  
+  sint64 node_nb;
+  double time;
+  double speed;
+  double cpu;
+  double hash;
+  move_t current_line[LineSize];
+  
+  int root_move;
+  int root_move_pos;
+  int root_move_nb;
+  bool multipv_mode;
+  int multipvSP;
+  int multipvScore[MultiPVStackSize];
+  move_t multipvMove[MultiPVStackSize];
+  char info[UciStringSize];
+} uci_t;
+
+typedef enum {
+   EVENT_NONE         = 0,
+   EVENT_UCI          = 1 << 0,
+   EVENT_READY        = 1 << 1,
+   EVENT_STOP         = 1 << 2,
+   EVENT_MOVE         = 1 << 3,
+   EVENT_PV           = 1 << 4,
+   EVENT_DEPTH        = 1 << 5,
+   EVENT_DRAW         = 1 << 6,
+   EVENT_RESIGN       = 1 << 7,
+   EVENT_ILLEGAL_MOVE = 1 << 8,
+   EVENT_INFO         = 1 << 9
+} dummy_event_t;
 
 // variables
 
@@ -86,27 +96,11 @@ extern void uci_send_stop         (uci_t * uci);
 extern void uci_send_stop_sync    (uci_t * uci);
 extern void uci_send_ucinewgame   (uci_t * uci);
 extern void uci_set_threads       (uci_t * uci, int n);
-extern bool uci_thread_option_exist(uci_t * uci);
 extern const char * uci_thread_option(uci_t * uci);
-extern int uci_get_option          (uci_t * uci, const char * name);
-
-extern bool uci_option_exist      (uci_t * uci, const char option[]);
-extern void uci_send_option       (uci_t * uci, const char option[], const char format[], ...);
-
-extern void uci_close           (uci_t * uci);
-
-extern void uci_clear           (uci_t * uci);
-
-extern int  uci_parse           (uci_t * uci, const char string[]);
-
-void uci_set_option(uci_t * uci,
-                    const char * name,
-                    const char * default_,
-                    const char * type,
-                    const char * max,
-                    const char * min,
-                    int var_nb,
-                    const char * var[]);
+extern bool uci_send_option       (uci_t * uci, const char option[], const char format[], ...);
+extern void uci_close             (uci_t * uci);
+extern void uci_clear             (uci_t * uci);
+extern int  uci_parse             (uci_t * uci, const char string[]);
 
 #endif // !defined UCI_H