convert files to new include file locations

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22347 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/drivers/ide_adapter.h

@@ -19,6 +19,7 @@
 
 #include <bus/PCI.h>
 #include <bus/IDE.h>
+#include <ide_types.h>
 #include <device_manager.h>
 
 

headers/private/drivers/ide_types.h

@@ -9,14 +9,11 @@
 	IDE bus manager interface
 */
 
-#ifndef __IDE_H__
-#define __IDE_H__
+#ifndef __IDE_TYPES_H__
+#define __IDE_TYPES_H__
 
-#include <bus_manager.h>
 #include <iovec.h>
 #include <lendian_bitfield.h>
-#include <device_manager.h>
-#include <KernelExport.h>
 
 // IDE task file.
 // contains the command block interpreted under different conditions with
@@ -25,7 +22,7 @@
 // are twice as many bytes as registers - the first eight bytes are those
 // that must be written first, the second eight bytes are those that
 // must be written second.
-typedef union {
+union ide_task_file {
 	struct {
 		uint8	features;
 		uint8	sector_count;
@@ -204,7 +201,8 @@ typedef union {
 		uint8	device_head;
 		uint8	status;
 	} read;
-} ide_task_file;
+};
+typedef union ide_task_file ide_task_file;
 
 // content of "mode" field
 enum {
@@ -213,7 +211,7 @@ enum {
 };
 
 // mask for ide_task_file fields to be written
-typedef enum {
+enum {
 	ide_mask_features	 		= 0x01,
 	ide_mask_sector_count		= 0x02,
 
@@ -249,7 +247,7 @@ typedef enum {
 	ide_mask_HOB				= 0x780
 
 	//ide_mask_all			= 0x7f
-} ide_reg_mask;
+}; // ide_reg_mask
 
 // status register
 enum {
@@ -300,64 +298,4 @@ enum {
 
 typedef struct ide_channel_info *ide_channel_cookie;
 
-
-// Controller Driver Node
-
-// attributes:
-
-// node type
-#define IDE_BUS_TYPE_NAME "bus/ide/v1"
-// maximum number of devices connected to controller (uint8, optional, default:2)
-#define IDE_CONTROLLER_MAX_DEVICES_ITEM "ide/max_devices"
-// set to not-0 if DMA is supported (uint8, optional, default:0)
-// (if so, publish necessary blkdev restriction too)
-#define IDE_CONTROLLER_CAN_DMA_ITEM "ide/can_DMA"
-// set to not-0 if CQ is supported (uint8, optional, default:1)
-#define IDE_CONTROLLER_CAN_CQ_ITEM "ide/can_CQ"
-// name of controller (string, required)
-#define IDE_CONTROLLER_CONTROLLER_NAME_ITEM "ide/controller_name"
-
-// interface of controller driver
-typedef struct {
-	driver_module_info info;
-
-	status_t (*write_command_block_regs)
-		(void *channel_cookie, ide_task_file *tf, ide_reg_mask mask);
-	status_t (*read_command_block_regs)
-		(void *channel_cookie, ide_task_file *tf, ide_reg_mask mask);
-
-	uint8 (*get_altstatus) (void *channel_cookie);
-	status_t (*write_device_control) (void *channel_cookie, uint8 val);	
-
-	status_t (*write_pio) (void *channel_cookie, uint16 *data, int count, bool force_16bit );
-	status_t (*read_pio) (void *channel_cookie, uint16 *data, int count, bool force_16bit );
-
-	status_t (*prepare_dma)(void *channel_cookie, 
-							const physical_entry *sg_list, size_t sg_list_count,
-	                        bool write);
-	status_t (*start_dma)(void *channel_cookie);
-	status_t (*finish_dma)(void *channel_cookie);
-} ide_controller_interface;
-
-
-// channel cookie, issued by ide bus manager
-typedef struct ide_bus_info *ide_channel;
-
-
-// Interface for Controller Driver
-
-// interface of bus manager as seen from controller driver
-// use this interface as the fixed consumer of your controller driver
-typedef struct {
-	driver_module_info info;
-
-	// status - status read from controller (_not_ alt_status, as reading
-	//          normal status acknowledges IRQ request of device)
-	status_t	(*irq_handler)( ide_channel channel, uint8 status );
-} ide_for_controller_interface;
-
-
-#define IDE_FOR_CONTROLLER_MODULE_NAME "bus_managers/ide/controller/v1"
-
-
 #endif	/* __IDE_H__ */

headers/private/drivers/scsi_periph.h

@@ -20,7 +20,7 @@
 
 #include <bus/SCSI.h>
 #include <block_io.h>
-#include <bus/scsi/scsi_cmds.h>
+#include <scsi_cmds.h>
 #include <Drivers.h>
 
 // cookie issued by module per device