Changeset 41b56084 in mainline

Timestamp:

2011-01-09T17:55:20Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8871dba

Parents:

50c57df

Message:

Move headers declaring ops structures to ops/ subdirectory. The directory name 'ops/' does not imply device drivers because eventually this should be moved to the C library and open for use by all servers/protocols, not just device drivers.

Location:

uspace

Files:

• drv/isa/isa.c (modified) (1 diff)
• drv/ns8250/ns8250.c (modified) (1 diff)
• drv/pciintel/pci.c (modified) (1 diff)
• drv/rootpc/rootpc.c (modified) (1 diff)
• drv/test1/char.c (modified) (1 diff)
• lib/drv/generic/remote_char.c (modified) (1 diff)
• lib/drv/generic/remote_res.c (modified) (1 diff)
• lib/drv/include/ops/char_dev.h (moved) (moved from uspace/lib/drv/include/char_dev.h ) (1 diff)
• lib/drv/include/ops/hw_res.h (moved) (moved from uspace/lib/drv/include/hw_res.h ) (1 diff)

uspace/drv/isa/isa.c

@@ -51 +51 @@
 
 #include <driver.h>
-#include <hw_res.h>
+#include <ops/hw_res.h>
 
 #include <devman.h>

uspace/drv/ns8250/ns8250.c

@@ -53 +53 @@
 
 #include <driver.h>
-#include <char_dev.h>
+#include <ops/char_dev.h>
 
 #include <devman.h>

uspace/drv/pciintel/pci.c

@@ -49 +49 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-#include <hw_res.h>
+#include <ops/hw_res.h>
 #include <device/hw_res.h>
 #include <ddi.h>

uspace/drv/rootpc/rootpc.c

@@ -50 +50 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-#include <hw_res.h>
+#include <ops/hw_res.h>
 #include <device/hw_res.h>
 

uspace/drv/test1/char.c

@@ -33 +33 @@
 #include <errno.h>
 #include <mem.h>
-#include <char_dev.h>
+#include <ops/char_dev.h>
 
 #include "test1.h"

uspace/lib/drv/generic/remote_char.c

@@ -37 +37 @@
 #include <errno.h>
 
-#include "char_dev.h"
+#include "ops/char_dev.h"
 #include "driver.h"
 

uspace/lib/drv/generic/remote_res.c

@@ -37 +37 @@
 #include <errno.h>
 
+#include "ops/hw_res.h"
 #include "driver.h"
-#include "hw_res.h"
 
 static void remote_res_get_resource_list(device_t *, void *, ipc_callid_t,

uspace/lib/drv/include/ops/char_dev.h

@@ -33 +33 @@
  */
 
-#ifndef LIBDRV_CHAR_DEV_H_
-#define LIBDRV_CHAR_DEV_H_
+#ifndef LIBDRV_OPS_CHAR_DEV_H_
+#define LIBDRV_OPS_CHAR_DEV_H_
 
-#include "driver.h"
+#include "../driver.h"
 
 typedef struct {

uspace/lib/drv/include/ops/hw_res.h

@@ -33 +33 @@
  */
 
-#ifndef LIBDRV_HW_RES_H_
-#define LIBDRV_HW_RES_H_
+#ifndef LIBDRV_OPS_HW_RES_H_
+#define LIBDRV_OPS_HW_RES_H_
 
 #include <device/hw_res.h>
 #include <sys/types.h>
+
+#include "../driver.h"
 
 typedef struct {