From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Tue, 10 Jun 2008 19:13:46 +0000 (+0000)
Subject: added dma device
X-Git-Tag: boot386puppy-26-to-ide~24
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=68cac210354f03675feb5370dfa7fae1fb97ceee

added dma device
---

diff --git a/palacios/include/devices/8237_dma.h b/palacios/include/devices/8237_dma.h
new file mode 100644
index 0000000..e26f760
--- /dev/null
+++ b/palacios/include/devices/8237_dma.h
@@ -0,0 +1,12 @@
+#ifndef __8237_DMA_H
+#define __8237_DMA_H
+
+
+#include <palacios/vm_dev.h>
+
+struct vm_device * create_dma();
+
+
+
+
+#endif
diff --git a/palacios/src/devices/8237_dma.c b/palacios/src/devices/8237_dma.c
new file mode 100644
index 0000000..dc043b4
--- /dev/null
+++ b/palacios/src/devices/8237_dma.c
@@ -0,0 +1,36 @@
+#include <devices/8237_dma.h>
+
+
+
+
+struct dma_state {
+  int tmp;
+
+};
+
+
+static int dma_init(struct vm_device * dev) {
+
+  return 0;
+}
+
+
+
+static struct vm_device_ops dev_ops = {
+  .init = dma_init,
+  .deinit = NULL,
+  .reset = NULL,
+  .start = NULL,
+  .stop = NULL,
+};
+
+struct vm_device * create_dma() {
+  struct dma_state * dma = NULL;
+
+  dma = (struct dma_state *)V3_Malloc(sizeof(struct dma_state));
+  V3_ASSERT(dma != NULL);
+
+  struct vm_device * dev = create_device("DMA", &dev_ops, dma);
+
+  return dma;
+}
diff --git a/palacios/src/vmboot/rombios/rombios.c b/palacios/src/vmboot/rombios/rombios.c
index 047bd32..625e648 100644
--- a/palacios/src/vmboot/rombios/rombios.c
+++ b/palacios/src/vmboot/rombios/rombios.c
@@ -1,6 +1,6 @@
 //  -*- fundamental -*-
 /////////////////////////////////////////////////////////////////////////
-// $Id: rombios.c,v 1.6 2008/05/30 00:46:55 pdinda Exp $
+// $Id: rombios.c,v 1.7 2008/06/10 19:13:49 jarusl Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -132,11 +132,11 @@
 
 #define DEBUG_ROMBIOS      1
 
-#define DEBUG_ATA          1
+#define DEBUG_ATA          0
 #define DEBUG_INT13_HD     0
-#define DEBUG_INT13_CD     0
+#define DEBUG_INT13_CD     1
 #define DEBUG_INT13_ET     0
-#define DEBUG_INT13_FL     0
+#define DEBUG_INT13_FL     1
 #define DEBUG_INT15        0
 #define DEBUG_INT16        0
 #define DEBUG_INT1A        0
@@ -945,10 +945,10 @@ Bit16u cdrom_boot();
 
 #endif // BX_ELTORITO_BOOT
 
-static char bios_cvs_version_string[] = "$Revision: 1.6 $";
-static char bios_date_string[] = "$Date: 2008/05/30 00:46:55 $";
+static char bios_cvs_version_string[] = "$Revision: 1.7 $";
+static char bios_date_string[] = "$Date: 2008/06/10 19:13:49 $";
 
-static char CVSID[] = "$Id: rombios.c,v 1.6 2008/05/30 00:46:55 pdinda Exp $";
+static char CVSID[] = "$Id: rombios.c,v 1.7 2008/06/10 19:13:49 jarusl Exp $";
 
 /* Offset to skip the CVS $Id: prefix */ 
 #define bios_version_string  (CVSID + 4)
@@ -8302,6 +8302,8 @@ boot_setup:
   mov ax,    #0xaa55 ;; set ok flag
 
   pop bp
+  mov al, 0xf3
+  outb #0x80, al
   iret               ;; Beam me up Scotty
 
 ;----------