Changeset dd0c8a0 in mainline for uspace/srv/devman/main.h

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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.

File:

• uspace/srv/devman/main.h (moved) (moved from uspace/srv/net/inetsrv/inet_util.h ) (2 diffs)

uspace/srv/devman/main.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup inet
+/** @addtogroup devman
  * @{
  */
-/**
- * @file
- * @brief
- */
 
-#ifndef INET_UTIL_H_
-#define INET_UTIL_H_
+#ifndef MAIN_H_
+#define MAIN_H_
 
-#include <sys/types.h>
+#include "devman.h"
 
-uint32_t inet_netmask(int bits);
+extern driver_list_t drivers_list;
+extern dev_tree_t device_tree;
 
 #endif