Merge remote-tracking branch 'origin/master' into isa/arm64

[lunaix-os.git] / lunaix-os / hal / gfxa / gfxm.c

diff --git a/lunaix-os/hal/gfxa/gfxm.c b/lunaix-os/hal/gfxa/gfxm.c
index 26532a2871cf5f4cee550b3815288ff27af68730..a58e88c0a2c3675b896a3758032d4d37656ecfab 100644 (file)
--- a/lunaix-os/hal/gfxa/gfxm.c
+++ b/lunaix-os/hal/gfxa/gfxm.c
@@ -10,10 +10,10 @@
 DEFINE_LLIST(gfxa_flat);
 DECLARE_HASHTABLE(gfxa_idset, 8);
 
-struct device* gfxa_devcat = NULL;
+struct device_cat* gfxa_devcat = NULL;
 static int id = 0;
 
-static struct devclass gfxa_class = DEVCLASS(DEV_BUILTIN, DEVFN_DISP, DEV_GFXA);
+static struct devclass gfxa_class = DEVCLASS(GENERIC, DISP, GFXA);
 
 static int
 __gfxa_cmd_router(struct device* dev, u32_t req, va_list args)
@@ -92,7 +92,7 @@ gfxm_alloc_adapter(void* hw_obj)
     }
 
     struct gfxa* gfxa = valloc(sizeof(struct gfxa));
-    struct device* gfxa_dev = device_allocsys(gfxa_devcat, gfxa);
+    struct device* gfxa_dev = device_allocsys(dev_meta(gfxa_devcat), gfxa);
 
     *gfxa = (struct gfxa){ .dev = gfxa_dev, .hw_obj = hw_obj };
 
@@ -109,7 +109,7 @@ gfxm_register(struct gfxa* gfxa)
     llist_append(&gfxa_flat, &gfxa->gfxas);
     hashtable_hash_in(gfxa_idset, &gfxa->gfxas_id, gfxa->id);
 
-    device_register(gfxa->dev, &gfxa_class, "gfxa%d", gfxa->id);
+    register_device(gfxa->dev, &gfxa_class, "gfxa%d", gfxa->id);
 }
 
 struct gfxa*