hw: move audio devices to hw/audio/, configure via default-configs/

[qemu.git] / hw / framebuffer.c

diff --git a/hw/framebuffer.c b/hw/framebuffer.c
index 2a870961bc965155de650e81773c21a272a60648..7326a98a41b581e490b3107ca279b81a736ef37e 100644 (file)
--- a/hw/framebuffer.c
+++ b/hw/framebuffer.c
@@ -17,14 +17,14 @@
    - Remove all DisplayState knowledge from devices.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
-#include "framebuffer.h"
+#include "hw/framebuffer.h"
 
 /* Render an image from a shared memory framebuffer.  */
    
 void framebuffer_update_display(
-    DisplayState *ds,
+    DisplaySurface *ds,
     MemoryRegion *address_space,
     hwaddr base,
     int cols, /* Width in pixels.  */
@@ -73,7 +73,7 @@ void framebuffer_update_display(
         return;
     }
     src = src_base;
-    dest = ds_get_data(ds);
+    dest = surface_data(ds);
     if (dest_col_pitch < 0)
         dest -= dest_col_pitch * (cols - 1);
     if (dest_row_pitch < 0) {