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 85a00a5798695fe15de37de695942d5c474c950d..7326a98a41b581e490b3107ca279b81a736ef37e 100644 (file)
--- a/hw/framebuffer.c
+++ b/hw/framebuffer.c
@@ -17,16 +17,16 @@
    - Remove all DisplayState knowledge from devices.
  */
 
-#include "hw.h"
-#include "console.h"
-#include "framebuffer.h"
+#include "hw/hw.h"
+#include "ui/console.h"
+#include "hw/framebuffer.h"
 
 /* Render an image from a shared memory framebuffer.  */
    
 void framebuffer_update_display(
-    DisplayState *ds,
+    DisplaySurface *ds,
     MemoryRegion *address_space,
-    target_phys_addr_t base,
+    hwaddr base,
     int cols, /* Width in pixels.  */
     int rows, /* Height in pixels.  */
     int src_width, /* Length of source line, in bytes.  */
@@ -38,7 +38,7 @@ void framebuffer_update_display(
     int *first_row, /* Input and output.  */
     int *last_row /* Output only */)
 {
-    target_phys_addr_t src_len;
+    hwaddr src_len;
     uint8_t *dest;
     uint8_t *src;
     uint8_t *src_base;
@@ -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) {
@@ -107,5 +107,4 @@ void framebuffer_update_display(
                               DIRTY_MEMORY_VGA);
     *first_row = first;
     *last_row = last;
-    return;
 }