Changeset f126c87 in mainline for uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

• uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h (modified) (3 diffs)

uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbohci
  * @{
@@ -32 +33 @@
  * @brief OHCI driver
  */
+
 #ifndef DRV_OHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H
 #define DRV_OHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H
@@ -139 +141 @@
         return OHCI_MEM32_RD(instance->be) - OHCI_MEM32_RD(instance->cbp) + 1;
 }
+
 #endif
+
 /**
  * @}