1 files changed, 6 insertions, 10 deletions
diff --git a/fw/fe310/test/cam.c b/fw/fe310/test/cam.c
index 766884b..7e84cdf 100644
--- a/fw/fe310/test/cam.c
+++ b/fw/fe310/test/cam.c
@@ -4,11 +4,11 @@
 #include <string.h>
 
 #include <eos.h>
-#include <cam.h>
 #include <board.h>
+#include <soc/i2c.h>
 
-#include <i2c.h>
-#include <i2c/ov2640.h>
+#include <dev/cam.h>
+#include <dev/ov2640.h>
 
 #include <eve/eve.h>
 #include <eve/eve_kbd.h>
@@ -18,8 +18,6 @@
 #include <eve/screen/page.h>
 #include <eve/screen/form.h>
 
-#include <eve/widget/widgets.h>
-
 #include "app/app_root.h"
 
 #include "cam.h"
@@ -125,12 +123,12 @@ void fbuf_print(uint8_t *fbuf, size_t size) {
 }
 
 void app_cam(EVEWindow *window, EVEViewStack *stack) {
-    EVEWidgetSpec spec[] = {
+    EVEFormSpec spec[] = {
         {
             .widget.type = EVE_WIDGET_TYPE_FREE,
             .widget.g.h = CAM_W,
-            .widget.spec.free.draw = image_draw,
-            .widget.spec.free.touch = image_touch,
+            .widget.tspec.free.draw = image_draw,
+            .widget.tspec.free.touch = image_touch,
         },
     };
     EVEForm *form = eve_form_create(window, stack, spec, 1, NULL, NULL, app_cam_close);
@@ -140,11 +138,9 @@ void app_cam(EVEWindow *window, EVEViewStack *stack) {
     eos_time_sleep(100);
 
     eos_i2c_speed(100000);
-    eos_i2c_start();
     rv = eos_ov2640_init();
     if (!rv) rv = eos_ov2640_set_pixfmt(PIXFORMAT_JPEG);
     if (!rv) rv = eos_ov2640_set_framesize(FRAMESIZE_VGA);
-    eos_i2c_stop();
     eos_i2c_speed(EOS_I2C_SPEED);
 
     if (!rv) {