0a57a79e3
Eric Andersen
2003-08-06
Subject
Patch from Steven Scholz:
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/usage.h+7 -1
| @@ -835,6 +835,12 @@ | |
| #define USAGE_TRISTATE_HWIF(a) | |
| #endif | |
| + | #ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA |
| + | #define USAGE_GETSET_DMA(a) a |
| + | #else |
| + | #define USAGE_GETSET_DMA(a) |
| + | #endif |
| + | |
| #define hdparm_trivial_usage \ | |
| "[options] [device] .." | |
| #define hdparm_full_usage \ | |
| @@ -845,7 +851,7 @@ | |
| " -B set Advanced Power Management setting (1-255)\n" \ | |
| " -c get/set IDE 32-bit IO setting\n" \ | |
| " -C check IDE power mode status\n" \ | |
| - | " -d get/set using_dma flag\n" \ |
| + | USAGE_GETSET_DMA(" -d get/set using_dma flag\n") \ |
| " -D enable/disable drive defect-mgmt\n" \ | |
| " -f flush buffer cache for device on exit\n" \ | |
| " -g display drive geometry\n" \ | |
miscutils/Config.in+8 -0
| @@ -100,6 +100,14 @@ config CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF | |
| and the '-b' option to get/set bus state. This is dangerous | |
| stuff, so you should probably say N. | |
| + | config CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA |
| + | bool " get/set using_dma flag (DANGEROUS)" |
| + | default n |
| + | depends on CONFIG_HDPARM |
| + | help |
| + | Enables the 'hdparm -d' option to get/set using_dma flag. |
| + | This is dangerous stuff, so you should probably say N. |
| + | |
| config CONFIG_MAKEDEVS | |
| bool "makedevs" | |
| default n | |
miscutils/hdparm.c+5 -1
| @@ -1820,6 +1820,7 @@ static void process_dev (char *devname) | |
| if (ioctl(fd, HDIO_SET_UNMASKINTR, unmask)) | |
| bb_perror_msg(" HDIO_SET_UNMASKINTR failed"); | |
| } | |
| + | #ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA |
| if (set_dma) { | |
| no_scsi(); | |
| if (get_dma) { | |
| @@ -1829,6 +1830,7 @@ static void process_dev (char *devname) | |
| if (ioctl(fd, HDIO_SET_DMA, dma)) | |
| bb_perror_msg(" HDIO_SET_DMA failed"); | |
| } | |
| + | #endif /* CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA */ |
| if (set_dma_q) { | |
| no_scsi(); | |
| if (get_dma_q) { | |
| @@ -2080,7 +2082,7 @@ static void process_dev (char *devname) | |
| } | |
| } | |
| - | #ifdef CONFIG_FEATURE_HDPARM_HDIO_GET_DMA |
| + | #ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA |
| if ((verbose && !is_scsi_hd) || get_dma) { | |
| no_scsi(); | |
| if (ioctl(fd, HDIO_GET_DMA, &parm)) | |
| @@ -2382,6 +2384,7 @@ int hdparm_main(int argc, char **argv) | |
| unmask = *p++ - '0'; | |
| } | |
| break; | |
| + | #ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA |
| case 'd': | |
| get_dma = noisy; | |
| noisy = 1; | |
| @@ -2392,6 +2395,7 @@ int hdparm_main(int argc, char **argv) | |
| dma = *p++ - '0'; | |
| } | |
| break; | |
| + | #endif /* CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA */ |
| case 'n': | |
| get_nowerr = noisy; | |
| noisy = 1; | |