Changeset 6843a9c in mainline for uspace/drv/bus/isa/i8237.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Trivial conflicts.

File:

• uspace/drv/bus/isa/i8237.h (moved) (moved from uspace/drv/bus/usb/ehci/ehci.h ) (2 diffs)

uspace/drv/bus/isa/i8237.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbehci
+/** @addtogroup isa
  * @{
  */
+
 /** @file
- * Common EHCI definitions.
+ * @brief DMA memory management
  */
-#ifndef DRV_EHCI_EHCI_H
-#define DRV_EHCI_EHCI_H
 
-#include <usbhc_iface.h>
+#ifndef DRV_BUS_ISA_I8237_H
+#define DRV_BUS_ISA_I8237_H
 
-#define NAME "ehci"
-
-extern usbhc_iface_t ehci_hc_iface;
+extern int dma_setup_channel(unsigned int, uint32_t, uint16_t, uint8_t);
 
 #endif
+
 /**
  * @}
  */
-