convert files to new include file locations
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22347 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
@@ -13,292 +13,9 @@
|
||||
#define __IDE_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
|
||||
// first byte being first command register, second byte second command register
|
||||
// etc.; for lba48, registers must be written twice, therefore there
|
||||
// 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 {
|
||||
struct {
|
||||
uint8 features;
|
||||
uint8 sector_count;
|
||||
uint8 sector_number;
|
||||
uint8 cylinder_0_7;
|
||||
uint8 cylinder_8_15;
|
||||
LBITFIELD8_3(
|
||||
head : 4,
|
||||
device : 1,
|
||||
mode : 3
|
||||
);
|
||||
uint8 command;
|
||||
} chs;
|
||||
struct {
|
||||
uint8 features;
|
||||
uint8 sector_count;
|
||||
uint8 lba_0_7;
|
||||
uint8 lba_8_15;
|
||||
uint8 lba_16_23;
|
||||
LBITFIELD8_3(
|
||||
lba_24_27 : 4,
|
||||
device : 1,
|
||||
mode : 3
|
||||
);
|
||||
uint8 command;
|
||||
} lba;
|
||||
struct {
|
||||
LBITFIELD8_3(
|
||||
dma : 1,
|
||||
ovl : 1,
|
||||
_0_res2 : 6
|
||||
);
|
||||
LBITFIELD8_2(
|
||||
_1_res0 : 3,
|
||||
tag : 5
|
||||
);
|
||||
uint8 _2_res;
|
||||
uint8 byte_count_0_7;
|
||||
uint8 byte_count_8_15;
|
||||
LBITFIELD8_6(
|
||||
lun : 3,
|
||||
_5_res3 : 1,
|
||||
device : 1,
|
||||
_5_one5 : 1,
|
||||
_5_res6 : 1,
|
||||
_5_one7 : 1
|
||||
);
|
||||
uint8 command;
|
||||
} packet;
|
||||
struct {
|
||||
LBITFIELD8_5(
|
||||
ili : 1,
|
||||
eom : 1,
|
||||
abrt : 1,
|
||||
_0_res3 : 1,
|
||||
sense_key : 4
|
||||
);
|
||||
LBITFIELD8_4(
|
||||
cmd_or_data : 1, // 1 - cmd, 0 - data
|
||||
input_or_output : 1, // 0 - input (to device), 1 - output
|
||||
release : 1,
|
||||
tag : 5
|
||||
);
|
||||
uint8 _2_res;
|
||||
uint8 byte_count_0_7;
|
||||
uint8 byte_count_8_15;
|
||||
LBITFIELD8_5(
|
||||
_4_res0 : 4,
|
||||
device : 1,
|
||||
_4_obs5 : 1,
|
||||
_4_res6 : 1,
|
||||
_4_obs7 : 1
|
||||
);
|
||||
LBITFIELD8_7(
|
||||
chk : 1,
|
||||
_7_res1 : 2,
|
||||
drq : 1,
|
||||
serv : 1,
|
||||
dmrd : 1,
|
||||
drdy : 1,
|
||||
bsy : 1
|
||||
);
|
||||
} packet_res;
|
||||
struct {
|
||||
uint8 sector_count;
|
||||
LBITFIELD8_4( // only <tag> is defined for write
|
||||
cmd_or_data : 1, // 1 - cmd, 0 - data
|
||||
input_or_output : 1, // 0 - input (to device), 1 - output
|
||||
release : 1,
|
||||
tag : 5
|
||||
);
|
||||
uint8 lba_0_7;
|
||||
uint8 lba_8_15;
|
||||
uint8 lba_16_23;
|
||||
LBITFIELD8_3(
|
||||
lba_24_27 : 4,
|
||||
device : 1,
|
||||
mode : 3
|
||||
);
|
||||
uint8 command;
|
||||
} queued;
|
||||
struct {
|
||||
// low order bytes
|
||||
uint8 features;
|
||||
uint8 sector_count_0_7;
|
||||
uint8 lba_0_7;
|
||||
uint8 lba_8_15;
|
||||
uint8 lba_16_23;
|
||||
LBITFIELD8_3(
|
||||
_5low_res0 : 4,
|
||||
device : 1,
|
||||
mode : 3
|
||||
);
|
||||
uint8 command;
|
||||
|
||||
// high order bytes
|
||||
uint8 _0high_res;
|
||||
uint8 sector_count_8_15;
|
||||
uint8 lba_24_31;
|
||||
uint8 lba_32_39;
|
||||
uint8 lba_40_47;
|
||||
} lba48;
|
||||
struct {
|
||||
// low order bytes
|
||||
uint8 sector_count_0_7;
|
||||
LBITFIELD8_4(
|
||||
cmd_or_data : 1, // 1 - cmd, 0 - data
|
||||
input_or_output : 1, // 0 - input (to device), 1 - output
|
||||
release : 1,
|
||||
tag : 5
|
||||
);
|
||||
uint8 lba_0_7;
|
||||
uint8 lba_8_15;
|
||||
uint8 lba_16_23;
|
||||
LBITFIELD8_3(
|
||||
_5low_res0 : 4,
|
||||
device : 1,
|
||||
mode : 3
|
||||
);
|
||||
uint8 command;
|
||||
|
||||
// high order bytes
|
||||
uint8 sector_count_8_15;
|
||||
uint8 _1high_res;
|
||||
uint8 lba_24_31;
|
||||
uint8 lba_32_39;
|
||||
uint8 lba_40_47;
|
||||
} queued48;
|
||||
struct {
|
||||
uint8 _0_res[3];
|
||||
uint8 ver; // RMSN version
|
||||
LBITFIELD8_3(
|
||||
pena : 1, // previously enabled
|
||||
lock : 1, // capable of locking
|
||||
pej : 1 // can physically eject
|
||||
);
|
||||
} set_MSN_res;
|
||||
struct {
|
||||
uint8 r[7+5];
|
||||
} raw;
|
||||
struct {
|
||||
uint8 features;
|
||||
uint8 sector_count;
|
||||
uint8 sector_number;
|
||||
uint8 cylinder_low;
|
||||
uint8 cylinder_high;
|
||||
uint8 device_head;
|
||||
uint8 command;
|
||||
} write;
|
||||
struct {
|
||||
uint8 error;
|
||||
uint8 sector_count;
|
||||
uint8 sector_number;
|
||||
uint8 cylinder_low;
|
||||
uint8 cylinder_high;
|
||||
uint8 device_head;
|
||||
uint8 status;
|
||||
} read;
|
||||
} ide_task_file;
|
||||
|
||||
// content of "mode" field
|
||||
enum {
|
||||
ide_mode_chs = 5,
|
||||
ide_mode_lba = 7
|
||||
};
|
||||
|
||||
// mask for ide_task_file fields to be written
|
||||
typedef enum {
|
||||
ide_mask_features = 0x01,
|
||||
ide_mask_sector_count = 0x02,
|
||||
|
||||
// CHS
|
||||
ide_mask_sector_number = 0x04,
|
||||
ide_mask_cylinder_low = 0x08,
|
||||
ide_mask_cylinder_high = 0x10,
|
||||
|
||||
// LBA
|
||||
ide_mask_LBA_low = 0x04,
|
||||
ide_mask_LBA_mid = 0x08,
|
||||
ide_mask_LBA_high = 0x10,
|
||||
|
||||
// packet
|
||||
ide_mask_byte_count = 0x18,
|
||||
|
||||
// packet and dma queued result
|
||||
ide_mask_error = 0x01,
|
||||
ide_mask_ireason = 0x02,
|
||||
|
||||
ide_mask_device_head = 0x20,
|
||||
ide_mask_command = 0x40,
|
||||
|
||||
ide_mask_status = 0x40,
|
||||
|
||||
// for 48 bits, the following flags tell which registers to load twice
|
||||
ide_mask_features_48 = 0x80 | ide_mask_features,
|
||||
ide_mask_sector_count_48 = 0x80 | ide_mask_sector_count,
|
||||
ide_mask_LBA_low_48 = 0x100 | ide_mask_LBA_low,
|
||||
ide_mask_LBA_mid_48 = 0x200 | ide_mask_LBA_mid,
|
||||
ide_mask_LBA_high_48 = 0x400 | ide_mask_LBA_high,
|
||||
|
||||
ide_mask_HOB = 0x780
|
||||
|
||||
//ide_mask_all = 0x7f
|
||||
} ide_reg_mask;
|
||||
|
||||
// status register
|
||||
enum {
|
||||
ide_status_err = 0x01, // error
|
||||
ide_status_index = 0x02, // obsolete
|
||||
ide_status_corr = 0x04, // obsolete
|
||||
ide_status_drq = 0x08, // data request
|
||||
ide_status_dsc = 0x10, // reserved
|
||||
ide_status_service = 0x10, // ready to service device
|
||||
ide_status_dwf = 0x20, // reserved
|
||||
ide_status_dma = 0x20, // reserved
|
||||
ide_status_dmrd = 0x20, // packet: DMA ready
|
||||
ide_status_df = 0x20, // packet: disk failure
|
||||
ide_status_drdy = 0x40, // device ready
|
||||
ide_status_bsy = 0x80 // busy
|
||||
} ide_status_mask;
|
||||
|
||||
// device control register
|
||||
enum {
|
||||
// bit 0 must be zero
|
||||
ide_devctrl_nien = 0x02, // disable INTRQ
|
||||
ide_devctrl_srst = 0x04, // software device reset
|
||||
ide_devctrl_bit3 = 0x08, // don't know, but must be set
|
||||
// bits inbetween are reserved
|
||||
ide_devctrl_hob = 0x80 // read high order byte (for 48-bit lba)
|
||||
} ide_devcntrl_mask;
|
||||
|
||||
// error register - most bits are command specific
|
||||
enum {
|
||||
// always used
|
||||
ide_error_abrt = 0x04, // command aborted
|
||||
|
||||
// used for Ultra DMA modes
|
||||
ide_error_icrc = 0x80, // interface CRC error
|
||||
|
||||
// used by reading data transfers
|
||||
ide_error_unc = 0x40, // uncorrectable data error
|
||||
// used by writing data transfers
|
||||
ide_error_wp = 0x40, // media write protect
|
||||
|
||||
// used by all data transfer commands
|
||||
ide_error_mc = 0x20, // medium changed
|
||||
ide_error_idnf = 0x10, // CHS translation not init./ invalid CHS address
|
||||
ide_error_mcr = 0x08, // media change requested
|
||||
ide_error_nm = 0x02, // no media (for removable media devices)
|
||||
} ide_error_mask;
|
||||
|
||||
|
||||
typedef struct ide_channel_info *ide_channel_cookie;
|
||||
|
||||
|
||||
// Controller Driver Node
|
||||
@@ -317,14 +34,17 @@ typedef struct ide_channel_info *ide_channel_cookie;
|
||||
// name of controller (string, required)
|
||||
#define IDE_CONTROLLER_CONTROLLER_NAME_ITEM "ide/controller_name"
|
||||
|
||||
union ide_task_file;
|
||||
typedef unsigned int ide_reg_mask;
|
||||
|
||||
// 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);
|
||||
(void *channel_cookie, union 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);
|
||||
(void *channel_cookie, union ide_task_file *tf, ide_reg_mask mask);
|
||||
|
||||
uint8 (*get_altstatus) (void *channel_cookie);
|
||||
status_t (*write_device_control) (void *channel_cookie, uint8 val);
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include <bus/PCI.h>
|
||||
#include <bus/IDE.h>
|
||||
#include <ide_types.h>
|
||||
#include <device_manager.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__ */
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel bus_managers ide ;
|
||||
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) ] ;
|
||||
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
#include "ide_internal.h"
|
||||
|
||||
#include <bus/scsi/scsi_cmds.h>
|
||||
#include <scsi_cmds.h>
|
||||
|
||||
#include "ide_cmds.h"
|
||||
#include "ide_sim.h"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
|
||||
#include "ide_internal.h"
|
||||
#include <bus/scsi/scsi_cmds.h>
|
||||
#include <scsi_cmds.h>
|
||||
|
||||
#include "ide_sim.h"
|
||||
#include "ide_cmds.h"
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <bus/IDE.h>
|
||||
#include <bus/SCSI.h>
|
||||
#include "ide_device_infoblock.h"
|
||||
#include <ide_types.h>
|
||||
#include <device_manager.h>
|
||||
#include <fast_log.h>
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "ide_internal.h"
|
||||
#include "ide_sim.h"
|
||||
|
||||
#include <bus/scsi/scsi_cmds.h>
|
||||
#include <scsi_cmds.h>
|
||||
#include <safemode.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#define __IDE_SIM_H__
|
||||
|
||||
|
||||
#include "bus/scsi/scsi_cmds.h"
|
||||
#include "scsi_cmds.h"
|
||||
|
||||
extern scsi_for_sim_interface *scsi;
|
||||
extern scsi_sim_interface ide_sim_module;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel bus_managers scsi ;
|
||||
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) ] ;
|
||||
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
|
||||
#include <bus/SCSI.h>
|
||||
#include <bus/scsi/scsi_cmds.h>
|
||||
#include <scsi_cmds.h>
|
||||
#include <locked_pool.h>
|
||||
#include <device_manager.h>
|
||||
#include <fast_log.h>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel busses ide generic_ide_pci ;
|
||||
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
|
||||
KernelAddon generic_ide_pci :
|
||||
generic_ide_pci.c
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <bus/ide/ide_adapter.h>
|
||||
#include <ide_adapter.h>
|
||||
|
||||
#define debug_level_flow 0
|
||||
#define debug_level_error 3
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel busses ide ide_isa ;
|
||||
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
|
||||
# disable debug output, if debugging is disabled
|
||||
if $(DEBUG) = 0 {
|
||||
|
||||
@@ -16,8 +16,9 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <bus/IDE.h>
|
||||
#include <bus/ISA.h>
|
||||
#include <bus/IDE.h>
|
||||
#include <ide_types.h>
|
||||
#include <device_manager.h>
|
||||
#include <block_io.h>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel busses ide legacy_sata ;
|
||||
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
|
||||
KernelAddon legacy_sata :
|
||||
legacy_sata.c
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <string.h>
|
||||
#include <device_manager.h>
|
||||
#include <bus/IDE.h>
|
||||
#include <bus/ide/ide_adapter.h>
|
||||
#include <ide_adapter.h>
|
||||
#include <block_io.h>
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel busses ide promise_tx2 ;
|
||||
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
|
||||
KernelAddon promise_tx2 :
|
||||
promise_tx2.c
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel busses ide silicon_image_3112 ;
|
||||
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
|
||||
KernelAddon silicon_image_3112 :
|
||||
silicon_image_3112.c
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <string.h>
|
||||
#include <device_manager.h>
|
||||
#include <bus/IDE.h>
|
||||
#include <bus/ide/ide_adapter.h>
|
||||
#include <ide_adapter.h>
|
||||
#include <block_io.h>
|
||||
|
||||
#define TRACE(a...) dprintf("si-3112: " a)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel drivers disk scsi scsi_cd ;
|
||||
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
|
||||
KernelAddon scsi_cd :
|
||||
device.c
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <device_manager.h>
|
||||
#include "scsi_cd.h"
|
||||
#include <bus/scsi/scsi_periph.h>
|
||||
#include <scsi_periph.h>
|
||||
#include <block_io.h>
|
||||
|
||||
#define debug_level_flow 0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel drivers disk scsi scsi_dsk ;
|
||||
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
|
||||
KernelAddon scsi_dsk :
|
||||
device.c
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <device_manager.h>
|
||||
#include "scsi_dsk.h"
|
||||
#include <bus/scsi/scsi_periph.h>
|
||||
#include <scsi_periph.h>
|
||||
#include <block_io.h>
|
||||
|
||||
#define debug_level_flow 0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel file_systems cdda ;
|
||||
|
||||
UsePrivateHeaders [ FDirName kernel ] ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
|
||||
UsePrivateHeaders [ FDirName storage ] ;
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#define CDDA_H
|
||||
|
||||
|
||||
#include <bus/scsi/scsi_cmds.h>
|
||||
#include <scsi_cmds.h>
|
||||
|
||||
|
||||
static const uint32 kFramesPerSecond = 75;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#define CDDB_H
|
||||
|
||||
|
||||
#include <bus/scsi/scsi_cmds.h>
|
||||
#include <scsi_cmds.h>
|
||||
|
||||
|
||||
uint32 compute_cddb_disc_id(scsi_toc_toc &toc);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel generic ide_adapter ;
|
||||
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
|
||||
KernelAddon ide_adapter :
|
||||
ide_adapter.c
|
||||
|
||||
@@ -14,10 +14,11 @@
|
||||
#include <malloc.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <bus/IDE.h>
|
||||
#include <bus/ide/ide_adapter.h>
|
||||
#include <bus/PCI.h>
|
||||
#include <device_manager.h>
|
||||
#include <bus/PCI.h>
|
||||
#include <bus/IDE.h>
|
||||
#include <ide_types.h>
|
||||
#include <ide_adapter.h>
|
||||
#include <block_io.h>
|
||||
#include <lendian_bitfield.h>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel generic scsi_periph ;
|
||||
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers kernel ;
|
||||
|
||||
# disable debug output, if debugging is disabled
|
||||
if $(DEBUG) = 0 {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#define __SCSI_PERIPH_INT_H__
|
||||
|
||||
|
||||
#include <bus/scsi/scsi_periph.h>
|
||||
#include <scsi_periph.h>
|
||||
#include <block_io.h>
|
||||
#include <device_manager.h>
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
#include "scsi_periph_int.h"
|
||||
|
||||
#include <bus/scsi/scsi_cmds.h>
|
||||
#include <scsi_cmds.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin ideinfo ;
|
||||
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers ide ;
|
||||
|
||||
#UsePrivateHeaders kernel ;
|
||||
UsePrivateHeaders drivers ;
|
||||
|
||||
StdBinCommands
|
||||
ideinfo.c
|
||||
|
||||
Reference in New Issue
Block a user