Bugfixes: test leftovers, wrong paths

frontend/device/emulator/device.lua

@@ -1,6 +1,5 @@
 local Generic = require("device/generic/device")
 local util = require("ffi/util")
-local Geom = require("ui/geometry")
 
 local function yes() return true end
 
@@ -11,7 +10,6 @@ local Device = Generic:new{
     hasKeys = yes,
     hasFrontlight = yes,
     isTouchDevice = yes,
-    viewport = Geom:new{x=40, y=40, w=550, h=650},
 }
 
 function Device:init()

frontend/device/generic/device.lua

@@ -40,10 +40,10 @@ end
 
 function Device:init()
     if not self.screen then
-        self.screen = require("device/generic/screen"):new{device = self}
+        self.screen = require("device/screen"):new{device = self}
     end
     if not self.input then
-        self.input = require("device/generic/input"):new{device = self}
+        self.input = require("device/input"):new{device = self}
     end
     if not self.powerd then
         self.powerd = require("device/generic/powerd"):new{device = self}