X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8237_dma.c;h=f13113864260a1d8cc4c8e98588c9e7adb6e216b;hb=2282a040e60b24d3fb7c48bb197c5bff6636df67;hp=00c91c5c08b8287cfb8893bec6c00aa2ebed610d;hpb=4f7c3b759e3889870c5b5e7d09b3ffcc168e5632;p=palacios.git

diff --git a/palacios/src/devices/8237_dma.c b/palacios/src/devices/8237_dma.c
index 00c91c5..f131138 100644
--- a/palacios/src/devices/8237_dma.c
+++ b/palacios/src/devices/8237_dma.c
@@ -1,5 +1,21 @@
-/* Northwestern University */
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
 
 #include <devices/8237_dma.h>
 
@@ -7,33 +23,34 @@
 
 
 struct dma_state {
-  int tmp;
-
+    int tmp
 };
 
 
 static int dma_init(struct vm_device * dev) {
-
-  return 0;
+    return 0;
 }
 
 
 
-static struct vm_device_ops dev_ops = {
-  .init = dma_init,
-  .deinit = NULL,
-  .reset = NULL,
-  .start = NULL,
-  .stop = NULL,
+static struct v3_device_ops dev_ops = {
+    .free = NULL,
+    .reset = NULL,
+    .start = NULL,
+    .stop = NULL,
 };
 
-struct vm_device * create_dma() {
-  struct dma_state * dma = NULL;
+struct vm_device * v3_create_dma() {
+    struct dma_state * dma = NULL;
+
+    dma = (struct dma_state *)V3_Malloc(sizeof(struct dma_state));
 
-  dma = (struct dma_state *)V3_Malloc(sizeof(struct dma_state));
-  V3_ASSERT(dma != NULL);
+    if (!dma) {
+	PrintError(info->vm_info, info, "Cannot allocate\n");
+	return NULL;
+    }
 
-  struct vm_device * dev = create_device("DMA", &dev_ops, dma);
+    struct vm_device * dev = v3_create_device("DMA", &dev_ops, dma);
 
-  return dma;
+    return dev;
 }