Changeset 69146b93 in mainline for kernel/arch/arm32/include/mach/beagleboardxm/beagleboardxm.h

Timestamp:

2012-11-26T19:02:45Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

04552324

Parents:

5d230a30 (diff), 7462674 (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:

Merged mainline,1723.

File:

• kernel/arch/arm32/include/mach/beagleboardxm/beagleboardxm.h (moved) (moved from uspace/srv/fs/ext2fs/ext2fs.h ) (2 diffs)

kernel/arch/arm32/include/mach/beagleboardxm/beagleboardxm.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Martin Sucha
+ * Copyright (c) 2012 Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+/** @addtogroup arm32beagleboardxm beagleboardxm
+ *  @brief BeagleBoard-xM platform.
+ *  @ingroup arm32
+ * @{
+ */
+/** @file
+ *  @brief BeagleBoard platform driver.
+ */
 
-/** @addtogroup fs
- * @{
- */ 
+#ifndef KERN_arm32_beagleboardxm_H_
+#define KERN_arm32_beagleboardxm_H_
 
-#ifndef EXT2FS_EXT2FS_H_
-#define EXT2FS_EXT2FS_H_
+#include <arch/machine_func.h>
 
-#include <libext2.h>
-#include <libfs.h>
-#include <sys/types.h>
-
-#define min(a, b)               ((a) < (b) ? (a) : (b))
-
-extern vfs_out_ops_t ext2fs_ops;
-extern libfs_ops_t ext2fs_libfs_ops;
-
-extern int ext2fs_global_init(void);
-extern int ext2fs_global_fini(void);
+extern struct arm_machine_ops bbxm_machine_ops;
 
 #endif
 
-/**
- * @}
+/** @}
  */
+