aaru-dps/aaruremote
1
0
Fork 0
mirror of https://github.com/aaru-dps/aaruremote.git synced 2025-12-16 19:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename more macros.

Browse Source
This commit is contained in:
Natalia Portillo
2020-03-01 05:50:46 +00:00
parent d4891dc781
commit 6b224c60a3
18 changed files with 328 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
linux/ata.c
View File

@@ -23,17 +23,17 @@ int32_t AtaProtocolToScsiDirection(uint8_t protocol)
{
switch(protocol)
{
case DICMOTE_ATA_PROTOCOL_DEVICE_DIAGNOSTIC:
case DICMOTE_ATA_PROTOCOL_DEVICE_RESET:
case DICMOTE_ATA_PROTOCOL_HARD_RESET:
case DICMOTE_ATA_PROTOCOL_NO_DATA:
case DICMOTE_ATA_PROTOCOL_SOFT_RESET:
case DICMOTE_ATA_PROTOCOL_RETURN_RESPONSE: return DICMOTE_SCSI_DIRECTION_NONE;
case DICMOTE_ATA_PROTOCOL_PIO_IN:
case DICMOTE_ATA_PROTOCOL_UDMA_IN: return DICMOTE_SCSI_DIRECTION_IN;
case DICMOTE_ATA_PROTOCOL_PIO_OUT:
case DICMOTE_ATA_PROTOCOL_UDMA_OUT: return DICMOTE_SCSI_DIRECTION_OUT;
default: return DICMOTE_SCSI_DIRECTION_UNSPECIFIED;
case AARUREMOTE_ATA_PROTOCOL_DEVICE_DIAGNOSTIC:
case AARUREMOTE_ATA_PROTOCOL_DEVICE_RESET:
case AARUREMOTE_ATA_PROTOCOL_HARD_RESET:
case AARUREMOTE_ATA_PROTOCOL_NO_DATA:
case AARUREMOTE_ATA_PROTOCOL_SOFT_RESET:
case AARUREMOTE_ATA_PROTOCOL_RETURN_RESPONSE: return AARUREMOTE_SCSI_DIRECTION_NONE;
case AARUREMOTE_ATA_PROTOCOL_PIO_IN:
case AARUREMOTE_ATA_PROTOCOL_UDMA_IN: return AARUREMOTE_SCSI_DIRECTION_IN;
case AARUREMOTE_ATA_PROTOCOL_PIO_OUT:
case AARUREMOTE_ATA_PROTOCOL_UDMA_OUT: return AARUREMOTE_SCSI_DIRECTION_OUT;
default: return AARUREMOTE_SCSI_DIRECTION_UNSPECIFIED;
}
}
@@ -62,12 +62,12 @@ int32_t LinuxSendAtaChsCommand(void* device_ctx,
cdb[0] = 0x85;
cdb[1] = (protocol << 1) & 0x1E;
if(transfer_register != DICMOTE_ATA_TRANSFER_REGISTER_NONE && protocol != DICMOTE_ATA_PROTOCOL_NO_DATA)
if(transfer_register != AARUREMOTE_ATA_TRANSFER_REGISTER_NONE && protocol != AARUREMOTE_ATA_PROTOCOL_NO_DATA)
{
switch(protocol)
{
case DICMOTE_ATA_PROTOCOL_PIO_IN:
case DICMOTE_ATA_PROTOCOL_UDMA_IN: cdb[2] = 0x08; break;
case AARUREMOTE_ATA_PROTOCOL_PIO_IN:
case AARUREMOTE_ATA_PROTOCOL_UDMA_IN: cdb[2] = 0x08; break;
default: cdb[2] = 0x00; break;
}
@@ -137,12 +137,12 @@ int32_t LinuxSendAtaLba28Command(void* device_ctx,
cdb[0] = 0x85;
cdb[1] = (protocol << 1) & 0x1E;
if(transfer_register != DICMOTE_ATA_TRANSFER_REGISTER_NONE && protocol != DICMOTE_ATA_PROTOCOL_NO_DATA)
if(transfer_register != AARUREMOTE_ATA_TRANSFER_REGISTER_NONE && protocol != AARUREMOTE_ATA_PROTOCOL_NO_DATA)
{
switch(protocol)
{
case DICMOTE_ATA_PROTOCOL_PIO_IN:
case DICMOTE_ATA_PROTOCOL_UDMA_IN: cdb[2] = 0x08; break;
case AARUREMOTE_ATA_PROTOCOL_PIO_IN:
case AARUREMOTE_ATA_PROTOCOL_UDMA_IN: cdb[2] = 0x08; break;
default: cdb[2] = 0x00; break;
}
@@ -215,12 +215,12 @@ int32_t LinuxSendAtaLba48Command(void* device_ctx,
cdb[0] = 0x85;
cdb[1] = (protocol << 1) & 0x1E;
cdb[1] |= 0x01;
if(transfer_register != DICMOTE_ATA_TRANSFER_REGISTER_NONE && protocol != DICMOTE_ATA_PROTOCOL_NO_DATA)
if(transfer_register != AARUREMOTE_ATA_TRANSFER_REGISTER_NONE && protocol != AARUREMOTE_ATA_PROTOCOL_NO_DATA)
{
switch(protocol)
{
case DICMOTE_ATA_PROTOCOL_PIO_IN:
case DICMOTE_ATA_PROTOCOL_UDMA_IN: cdb[2] = 0x08; break;
case AARUREMOTE_ATA_PROTOCOL_PIO_IN:
case AARUREMOTE_ATA_PROTOCOL_UDMA_IN: cdb[2] = 0x08; break;
default: cdb[2] = 0x00; break;
}

36
linux/device.c
View File

@@ -75,17 +75,17 @@ int32_t LinuxGetDeviceType(void* device_ctx)
struct udev_device* udev_device;
const char* tmp_string;
char* chrptr;
int32_t device_type = DICMOTE_DEVICE_TYPE_UNKNOWN;
int32_t device_type = AARUREMOTE_DEVICE_TYPE_UNKNOWN;
udev = udev_new();
if(!udev) return DICMOTE_DEVICE_TYPE_UNKNOWN;
if(!udev) return AARUREMOTE_DEVICE_TYPE_UNKNOWN;
chrptr = strrchr(ctx->device_path, '/');
if(chrptr == 0) return DICMOTE_DEVICE_TYPE_UNKNOWN;
if(chrptr == 0) return AARUREMOTE_DEVICE_TYPE_UNKNOWN;
chrptr++;
if(chrptr == 0) return DICMOTE_DEVICE_TYPE_UNKNOWN;
if(chrptr == 0) return AARUREMOTE_DEVICE_TYPE_UNKNOWN;
udev_device = udev_device_new_from_subsystem_sysname(udev, "block", chrptr);
if(udev_device)
@@ -95,7 +95,7 @@ int32_t LinuxGetDeviceType(void* device_ctx)
{
if(strncmp(tmp_string, "ata", 3) == 0)
{
device_type = DICMOTE_DEVICE_TYPE_ATA;
device_type = AARUREMOTE_DEVICE_TYPE_ATA;
free((void*)tmp_string);
tmp_string = udev_device_get_property_value(udev_device, "ID_TYPE");
@@ -103,7 +103,7 @@ int32_t LinuxGetDeviceType(void* device_ctx)
if(tmp_string)
{
// TODO: ATAPI removable non optical disks
if(strncmp(tmp_string, "cd", 2) == 0) { device_type = DICMOTE_DEVICE_TYPE_ATAPI; }
if(strncmp(tmp_string, "cd", 2) == 0) { device_type = AARUREMOTE_DEVICE_TYPE_ATAPI; }
free((void*)tmp_string);
}
@@ -113,14 +113,14 @@ int32_t LinuxGetDeviceType(void* device_ctx)
free((void*)tmp_string);
tmp_string = malloc(1024);
device_type = DICMOTE_DEVICE_TYPE_MMC;
device_type = AARUREMOTE_DEVICE_TYPE_MMC;
if(tmp_string)
{
memset((void*)tmp_string, 0, 1024);
snprintf((char*)tmp_string, 1024, "/sys/block/%s/device/scr", chrptr);
if(access(tmp_string, R_OK) == 0) device_type = DICMOTE_DEVICE_TYPE_SECURE_DIGITAL;
if(access(tmp_string, R_OK) == 0) device_type = AARUREMOTE_DEVICE_TYPE_SECURE_DIGITAL;
free((void*)tmp_string);
}
@@ -134,7 +134,7 @@ int32_t LinuxGetDeviceType(void* device_ctx)
if(tmp_string)
{
if(strncmp(tmp_string, "cd", 2) == 0 || strncmp(tmp_string, "disk", 4) == 0)
{ device_type = DICMOTE_DEVICE_TYPE_SCSI; }
{ device_type = AARUREMOTE_DEVICE_TYPE_SCSI; }
free((void*)tmp_string);
}
@@ -142,7 +142,7 @@ int32_t LinuxGetDeviceType(void* device_ctx)
else if(strncmp(tmp_string, "nvme", 4) == 0)
{
free((void*)tmp_string);
device_type = DICMOTE_DEVICE_TYPE_NVME;
device_type = AARUREMOTE_DEVICE_TYPE_NVME;
}
}
}
@@ -151,7 +151,7 @@ int32_t LinuxGetDeviceType(void* device_ctx)
return device_type;
#else
int32_t dev_type = DICMOTE_DEVICE_TYPE_UNKNOWN;
int32_t dev_type = AARUREMOTE_DEVICE_TYPE_UNKNOWN;
const char* dev_name;
const char* sysfs_path;
char* dev_path;
@@ -169,13 +169,13 @@ int32_t LinuxGetDeviceType(void* device_ctx)
if(strlen(ctx->device_path) <= 5) return dev_type;
if(strstr(ctx->device_path, "nvme")) return DICMOTE_DEVICE_TYPE_NVME;
if(strstr(ctx->device_path, "nvme")) return AARUREMOTE_DEVICE_TYPE_NVME;
dev_name = ctx->device_path + 5;
if(strstr(ctx->device_path, "mmcblk"))
{
dev_type = DICMOTE_DEVICE_TYPE_MMC;
dev_type = AARUREMOTE_DEVICE_TYPE_MMC;
sysfs_path_scr = malloc(len);
@@ -183,7 +183,7 @@ int32_t LinuxGetDeviceType(void* device_ctx)
{
snprintf(sysfs_path_scr, len, "/sys/block/%s/device/scr", dev_name);
if(access(sysfs_path_scr, F_OK) == 0) dev_type = DICMOTE_DEVICE_TYPE_SECURE_DIGITAL;
if(access(sysfs_path_scr, F_OK) == 0) dev_type = AARUREMOTE_DEVICE_TYPE_SECURE_DIGITAL;
free(sysfs_path_scr);
}
@@ -264,10 +264,10 @@ int32_t LinuxGetDeviceType(void* device_ctx)
if(access(spi_path, F_OK) == 0 || access(fc_path, F_OK) == 0 || access(sas_path, F_OK) == 0 ||
access(iscsi_path, F_OK) == 0)
dev_type = DICMOTE_DEVICE_TYPE_SCSI;
dev_type = AARUREMOTE_DEVICE_TYPE_SCSI;
else if(access(scsi_path, F_OK) == 0)
{
dev_type = DICMOTE_DEVICE_TYPE_SCSI;
dev_type = AARUREMOTE_DEVICE_TYPE_SCSI;
memset(scsi_path, 0, len);
snprintf(scsi_path, len, "/sys/class/scsi_host/host%s/proc_name", host_no);
if(access(scsi_path, F_OK) == 0)
@@ -287,7 +287,7 @@ int32_t LinuxGetDeviceType(void* device_ctx)
if(strncmp(scsi_path, "ata", 3) == 0 || strncmp(scsi_path, "sata", 4) == 0 ||
strncmp(scsi_path, "ahci", 4) == 0)
{
dev_type = DICMOTE_DEVICE_TYPE_ATA;
dev_type = AARUREMOTE_DEVICE_TYPE_ATA;
memset(scsi_path, 0, len);
snprintf(scsi_path, len, "%s/%s/removable", PATH_SYS_DEVBLOCK, dev_name);
@@ -297,7 +297,7 @@ int32_t LinuxGetDeviceType(void* device_ctx)
ret = (size_t)fread(scsi_path, 1, 1, file);
if(ret == 1)
{
if(scsi_path[0] == '1') dev_type = DICMOTE_DEVICE_TYPE_ATAPI;
if(scsi_path[0] == '1') dev_type = AARUREMOTE_DEVICE_TYPE_ATAPI;
}
fclose(file);
}

12
linux/list_devices.c
View File

@@ -143,12 +143,12 @@ DeviceInfoList* LinuxListDevices()
switch(GetDeviceType(tmp_string))
{
case DICMOTE_DEVICE_TYPE_ATA: strncpy(list_next->this.bus, "ATA", 256); break;
case DICMOTE_DEVICE_TYPE_ATAPI: strncpy(list_next->this.bus, "ATAPI", 256); break;
case DICMOTE_DEVICE_TYPE_MMC:
case DICMOTE_DEVICE_TYPE_SECURE_DIGITAL: strncpy(list_next->this.bus, "MMC/SD", 256); break;
case DICMOTE_DEVICE_TYPE_NVME: strncpy(list_next->this.bus, "NVMe", 256); break;
case DICMOTE_DEVICE_TYPE_SCSI:
case AARUREMOTE_DEVICE_TYPE_ATA: strncpy(list_next->this.bus, "ATA", 256); break;
case AARUREMOTE_DEVICE_TYPE_ATAPI: strncpy(list_next->this.bus, "ATAPI", 256); break;
case AARUREMOTE_DEVICE_TYPE_MMC:
case AARUREMOTE_DEVICE_TYPE_SECURE_DIGITAL: strncpy(list_next->this.bus, "MMC/SD", 256); break;
case AARUREMOTE_DEVICE_TYPE_NVME: strncpy(list_next->this.bus, "NVMe", 256); break;
case AARUREMOTE_DEVICE_TYPE_SCSI:
memset((void*)tmp_string, 0, 1024);
snprintf((char*)tmp_string, 1024, "%s/%s/device", PATH_SYS_DEVBLOCK, dirent->d_name);
line_str = malloc(1024);

10
linux/scsi.c
View File

@@ -50,11 +50,11 @@ int32_t LinuxSendScsiCommand(void* device_ctx,
switch(direction)
{
case DICMOTE_SCSI_DIRECTION_IN: dir = SG_DXFER_FROM_DEV; break;
case DICMOTE_SCSI_DIRECTION_OUT: dir = SG_DXFER_TO_DEV; break;
case DICMOTE_SCSI_DIRECTION_INOUT:
case DICMOTE_SCSI_DIRECTION_UNSPECIFIED: dir = SG_DXFER_TO_FROM_DEV; break;
case DICMOTE_SCSI_DIRECTION_NONE:
case AARUREMOTE_SCSI_DIRECTION_IN: dir = SG_DXFER_FROM_DEV; break;
case AARUREMOTE_SCSI_DIRECTION_OUT: dir = SG_DXFER_TO_DEV; break;
case AARUREMOTE_SCSI_DIRECTION_INOUT:
case AARUREMOTE_SCSI_DIRECTION_UNSPECIFIED: dir = SG_DXFER_TO_FROM_DEV; break;
case AARUREMOTE_SCSI_DIRECTION_NONE:
default: dir = SG_DXFER_NONE; break;
}