1 files changed, 6 insertions, 19 deletions
diff --git a/fw/fe310/eos/eve/screen/form.h b/fw/fe310/eos/eve/screen/form.h
index 62e10f7..bc81d2d 100644
--- a/fw/fe310/eos/eve/screen/form.h
+++ b/fw/fe310/eos/eve/screen/form.h
@@ -2,28 +2,15 @@
 
 #include "../widget/widget.h"
 
-struct EVEWidget;
-struct EVEForm;
-struct EVEFormSpec;
-
-typedef int (*eve_form_uievt_t) (struct EVEForm *, uint16_t, void *);
-typedef void (*eve_form_action_t) (struct EVEForm *);
-typedef void (*eve_form_destructor_t) (struct EVEForm *);
-
-typedef struct EVEForm {
-    EVEPage p;
-    eve_form_action_t action;
-} EVEForm;
-
 typedef struct EVEFormSpec {
     EVELabelSpec label;
     EVEWidgetSpec widget;
 } EVEFormSpec;
 
-EVEForm *eve_form_create(EVEWindow *window, EVEViewStack *stack, EVEFormSpec *spec, uint16_t spec_size, eve_form_uievt_t uievt, eve_form_action_t action, eve_form_destructor_t destructor);
-void eve_form_init(EVEForm *form, EVEWindow *window, EVEViewStack *stack, EVEWidget *widget, uint16_t widget_size, eve_form_uievt_t uievt, eve_form_action_t action, eve_form_destructor_t destructor);
-void eve_form_set_widget(EVEForm *form, EVEWidget *widget, uint16_t widget_size);
-void eve_form_destroy(EVEForm *form);
-
-int eve_form_uievt(EVEForm *form, uint16_t evt, void *param);
+EVEPage *eve_form_create(EVEWindow *window, EVEViewStack *stack, EVEFormSpec spec[], uint16_t spec_size, eve_page_uievt_t uievt, eve_page_destructor_t destructor);
+void eve_form_init(EVEPage *page, EVEWindow *window, EVEViewStack *stack, EVEWidget *widget, uint16_t widget_size, eve_page_uievt_t uievt, eve_page_destructor_t destructor);
+void eve_form_set_widget(EVEPage *page, EVEWidget *widget, uint16_t widget_size);
+void eve_form_destroy(EVEPage *page);
 
+int eve_form_uievt(EVEPage *page, uint16_t evt, void *param);
+void eve_form_update_g(EVEPage *page, EVEWidget *_widget);