Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved declaration of gBootDevice into its own header.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15518 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-12-12 16:06:33 +00:00
parent aa9d29ba97
commit b53cc465d6
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
headers/private/kernel/boot_device.h Normal file
View File

@ -0,0 +1,15 @@
/*
* Copyright 2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _KERNEL_BOOT_DEVICE_H
#define _KERNEL_BOOT_DEVICE_H
#include <sys/types.h>
extern dev_t gBootDevice;
// defined in fs/vfs_boot.cpp
#endif /* _KERNEL_BOOT_DEVICE_H */

8
src/system/kernel/device_manager/probe.cpp
View File

@ -15,8 +15,7 @@
#include "device_manager_private.h" #include "device_manager_private.h"
#include <KernelExport.h> #include <boot_device.h>
#include <image.h>
#include <elf.h> #include <elf.h>
#include <kmodule.h> #include <kmodule.h>
#include <fs/KPath.h> #include <fs/KPath.h>
@ -24,6 +23,9 @@
#include <util/Stack.h> #include <util/Stack.h>
#include <util/kernel_cpp.h> #include <util/kernel_cpp.h>
#include <image.h>
#include <KernelExport.h>
#include <stdlib.h> #include <stdlib.h>
#include <dirent.h> #include <dirent.h>
#include <stdio.h> #include <stdio.h>
@ -70,8 +72,6 @@ static const char *kModulePaths[] = {
NULL NULL
}; };
extern dev_t gBootDevice;
// from fs/vfs.cpp
class DirectoryIterator { class DirectoryIterator {
public: public:

4
src/system/kernel/fs/devfs.cpp
View File

@ -14,6 +14,7 @@
#include <pnp_devfs.h> #include <pnp_devfs.h>
#include <NodeMonitor.h> #include <NodeMonitor.h>
#include <boot_device.h>
#include <kdevice_manager.h> #include <kdevice_manager.h>
#include <KPath.h> #include <KPath.h>
#include <vfs.h> #include <vfs.h>
@ -136,9 +137,6 @@ static status_t publish_device(struct devfs *fs, const char *path,
driver_entry *driver, device_hooks *ops); driver_entry *driver, device_hooks *ops);
// The boot device, if already present
extern dev_t gBootDevice;
/* the one and only allowed devfs instance */ /* the one and only allowed devfs instance */
static struct devfs *sDeviceFileSystem = NULL; static struct devfs *sDeviceFileSystem = NULL;

11
src/system/kernel/module.c
View File

@ -11,17 +11,18 @@
*/ */
#include <boot_device.h>
#include <elf.h>
#include <kmodule.h> #include <kmodule.h>
#include <lock.h> #include <lock.h>
#include <elf.h>
#include <vfs.h>
#include <util/khash.h> #include <util/khash.h>
#include <vfs.h>
#include <boot/elf.h> #include <boot/elf.h>
#include <sys/stat.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <sys/stat.h>
//#define TRACE_MODULE //#define TRACE_MODULE
@ -160,8 +161,6 @@ static const char * const sModulePaths[] = {
static hash_table *sModuleImagesHash; static hash_table *sModuleImagesHash;
static hash_table *sModulesHash; static hash_table *sModulesHash;
extern dev_t gBootDevice;
/** calculates hash for a module using its name */ /** calculates hash for a module using its name */