5ab3f48a92
* grub-core/Makefile.core.def (ata_pthru): Removed. (ahci): New module. (pata): Likewise. * grub-core/bus/usb/ohci.c (GRUB_MOD_FINI): Unregister preboot hook on unload. * grub-core/commands/hdparm.c (grub_hdparm_do_ata_cmd): Use ATA readwrite. (grub_hdparm_do_check_powermode_cmd): Likewise. (grub_hdparm_do_smart_cmd): Likewise. (grub_hdparm_set_val_cmd): Likewise. (grub_cmd_hdparm): Likewise. Check thta we have an ATA device. * grub-core/disk/ahci.c: New file. * grub-core/disk/ata.c: Factor out the low-level part into ... * grub-core/disk/pata.c: ... here. * grub-core/disk/ata_pthru.c: Contents moved to ... * grub-core/disk/pata.c: ... here. * grub-core/disk/scsi.c (grub_scsi_names): New array. (grub_scsi_iterate): Use grub_scsi_names. (grub_scsi_open): Likewise. * grub-core/kern/disk.c (grub_disk_ata_pass_through): Removed. * include/grub/ata.h (grub_ata_commands): Add DMA commands. (grub_ata_regs_t): New struct. (grub_disk_ata_pass_through_parms): Likewise. (grub_ata_device): Renamed to ... (grub_ata): ... this. (grub_ata_dev): New struct. Removed all low-level inline functions. * include/grub/scsi.h: Add PATA and AHCI subsystems. (grub_scsi_dev): Removed 'name' and 'id'. Added 'id' parameter to iterate hooks and open. All users updated. * util/grub-install.in: Handle AHCI disk module.
105 lines
2.8 KiB
C
105 lines
2.8 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2008 Free Software Foundation, Inc.
|
|
*
|
|
* GRUB is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GRUB is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GRUB_SCSI_H
|
|
#define GRUB_SCSI_H 1
|
|
|
|
typedef struct grub_scsi_dev *grub_scsi_dev_t;
|
|
|
|
void grub_scsi_dev_register (grub_scsi_dev_t dev);
|
|
void grub_scsi_dev_unregister (grub_scsi_dev_t dev);
|
|
|
|
struct grub_scsi;
|
|
|
|
enum
|
|
{
|
|
GRUB_SCSI_SUBSYSTEM_USBMS,
|
|
GRUB_SCSI_SUBSYSTEM_PATA,
|
|
GRUB_SCSI_SUBSYSTEM_AHCI,
|
|
GRUB_SCSI_NUM_SUBSYSTEMS
|
|
};
|
|
|
|
extern const char grub_scsi_names[GRUB_SCSI_NUM_SUBSYSTEMS][5];
|
|
|
|
#define GRUB_SCSI_ID_SUBSYSTEM_SHIFT 24
|
|
#define GRUB_SCSI_ID_BUS_SHIFT 8
|
|
#define GRUB_SCSI_ID_LUN_SHIFT 0
|
|
|
|
static inline grub_uint32_t
|
|
grub_make_scsi_id (int subsystem, int bus, int lun)
|
|
{
|
|
return (subsystem << GRUB_SCSI_ID_SUBSYSTEM_SHIFT)
|
|
| (bus << GRUB_SCSI_ID_BUS_SHIFT) | (lun << GRUB_SCSI_ID_LUN_SHIFT);
|
|
}
|
|
|
|
struct grub_scsi_dev
|
|
{
|
|
/* Call HOOK with each device name, until HOOK returns non-zero. */
|
|
int (*iterate) (int NESTED_FUNC_ATTR (*hook) (int id, int bus, int luns));
|
|
|
|
/* Open the device named NAME, and set up SCSI. */
|
|
grub_err_t (*open) (int id, int bus, struct grub_scsi *scsi);
|
|
|
|
/* Close the scsi device SCSI. */
|
|
void (*close) (struct grub_scsi *scsi);
|
|
|
|
/* Read SIZE bytes from the device SCSI into BUF after sending the
|
|
command CMD of size CMDSIZE. */
|
|
grub_err_t (*read) (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
|
|
grub_size_t size, char *buf);
|
|
|
|
/* Write SIZE bytes from BUF to the device SCSI after sending the
|
|
command CMD of size CMDSIZE. */
|
|
grub_err_t (*write) (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
|
|
grub_size_t size, char *buf);
|
|
|
|
/* The next scsi device. */
|
|
struct grub_scsi_dev *next;
|
|
};
|
|
|
|
struct grub_scsi
|
|
{
|
|
/* The underlying scsi device. */
|
|
grub_scsi_dev_t dev;
|
|
|
|
/* Type of SCSI device. XXX: Make enum. */
|
|
grub_uint8_t devtype;
|
|
|
|
int bus;
|
|
|
|
/* Number of LUNs. */
|
|
int luns;
|
|
|
|
/* LUN for this `struct grub_scsi'. */
|
|
int lun;
|
|
|
|
/* Set to 0 when not removable, 1 when removable. */
|
|
int removable;
|
|
|
|
/* Size of the device in blocks. */
|
|
int size;
|
|
|
|
/* Size of one block. */
|
|
int blocksize;
|
|
|
|
/* Device-specific data. */
|
|
void *data;
|
|
};
|
|
typedef struct grub_scsi *grub_scsi_t;
|
|
|
|
#endif /* GRUB_SCSI_H */
|