From 4cb3e57917e23f1d0f616170083213b4b118bc1d Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 27 Sep 2003 05:38:01 +0000 Subject: [PATCH] * devices.shilka: Add /dev/sda disk devices. * devices.cc: Regenerate. --- winsup/cygwin/ChangeLog | 5 + winsup/cygwin/devices.cc | 776 ++++++++++++++++++++++++++--------- winsup/cygwin/devices.shilka | 26 ++ 3 files changed, 605 insertions(+), 202 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 0e03999d5..17fb66334 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2003-09-27 Christopher Faylor + + * devices.shilka: Add /dev/sda disk devices. + * devices.cc: Regenerate. + 2003-09-27 Christopher Faylor * cygwin-shilka: Remove '#line directives' or suffer debugging oddities. diff --git a/winsup/cygwin/devices.cc b/winsup/cygwin/devices.cc index 84e5fea42..b9550de55 100644 --- a/winsup/cygwin/devices.cc +++ b/winsup/cygwin/devices.cc @@ -319,13 +319,13 @@ return NULL; } } case 8: - switch (KR_keyword [7]) + switch (KR_keyword [5]) { - case 'z': - if (strncmp (KR_keyword, "/dev/hdz", 8) == 0) + case 't': + if (strncmp (KR_keyword, "/dev/tty", 8) == 0) { { -return &dev_hdz_storage; +return &dev_tty_storage; } } @@ -336,14 +336,14 @@ return NULL; } } - case 'y': - switch (KR_keyword [5]) + case 's': + switch (KR_keyword [7]) { - case 't': - if (strncmp (KR_keyword, "/dev/tty", 8) == 0) + case 'z': + if (strncmp (KR_keyword, "/dev/sdz", 8) == 0) { { -return &dev_tty_storage; +return &dev_hdz_storage; } } @@ -354,8 +354,8 @@ return NULL; } } - case 'h': - if (strncmp (KR_keyword, "/dev/hdy", 8) == 0) + case 'y': + if (strncmp (KR_keyword, "/dev/sdy", 8) == 0) { { return &dev_hdy_storage; @@ -369,80 +369,71 @@ return NULL; } } - default: -{ -return NULL; - -} - } - case 'x': - if (strncmp (KR_keyword, "/dev/hdx", 8) == 0) - { + case 'x': + if (strncmp (KR_keyword, "/dev/sdx", 8) == 0) + { { return &dev_hdx_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'w': - if (strncmp (KR_keyword, "/dev/hdw", 8) == 0) - { + } + case 'w': + if (strncmp (KR_keyword, "/dev/sdw", 8) == 0) + { { return &dev_hdw_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'v': - if (strncmp (KR_keyword, "/dev/hdv", 8) == 0) - { + } + case 'v': + if (strncmp (KR_keyword, "/dev/sdv", 8) == 0) + { { return &dev_hdv_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'u': - if (strncmp (KR_keyword, "/dev/hdu", 8) == 0) - { + } + case 'u': + if (strncmp (KR_keyword, "/dev/sdu", 8) == 0) + { { return &dev_hdu_storage; } - } - else - { + } + else + { { return NULL; } - } - case 't': - switch (KR_keyword [5]) - { - case 'n': - if (strncmp (KR_keyword, "/dev/nst", 8) == 0) + } + case 't': + if (strncmp (KR_keyword, "/dev/sdt", 8) == 0) { { -return &dev_nst_storage; +return &dev_hdt_storage; } } @@ -453,11 +444,11 @@ return NULL; } } - case 'h': - if (strncmp (KR_keyword, "/dev/hdt", 8) == 0) + case 's': + if (strncmp (KR_keyword, "/dev/sds", 8) == 0) { { -return &dev_hdt_storage; +return &dev_hds_storage; } } @@ -468,65 +459,71 @@ return NULL; } } - default: + case 'r': + if (strncmp (KR_keyword, "/dev/sdr", 8) == 0) + { +{ +return &dev_hdr_storage; + +} + } + else + { { return NULL; } - } - case 's': - if (strncmp (KR_keyword, "/dev/hds", 8) == 0) - { + } + case 'q': + if (strncmp (KR_keyword, "/dev/sdq", 8) == 0) + { { -return &dev_hds_storage; +return &dev_hdq_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'r': - if (strncmp (KR_keyword, "/dev/hdr", 8) == 0) - { + } + case 'p': + if (strncmp (KR_keyword, "/dev/sdp", 8) == 0) + { { -return &dev_hdr_storage; +return &dev_hdp_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'q': - if (strncmp (KR_keyword, "/dev/hdq", 8) == 0) - { + } + case 'o': + if (strncmp (KR_keyword, "/dev/sdo", 8) == 0) + { { -return &dev_hdq_storage; +return &dev_hdo_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'p': - switch (KR_keyword [5]) - { - case 'h': - if (strncmp (KR_keyword, "/dev/hdp", 8) == 0) + } + case 'n': + if (strncmp (KR_keyword, "/dev/sdn", 8) == 0) { { -return &dev_hdp_storage; +return &dev_hdn_storage; } } @@ -537,11 +534,11 @@ return NULL; } } - case 'd': - if (strncmp (KR_keyword, "/dev/dsp", 8) == 0) + case 'm': + if (strncmp (KR_keyword, "/dev/sdm", 8) == 0) { { -return &dev_oss_dsp_storage; +return &dev_hdm_storage; } } @@ -552,50 +549,56 @@ return NULL; } } - default: + case 'l': + if (strncmp (KR_keyword, "/dev/sdl", 8) == 0) + { +{ +return &dev_hdl_storage; + +} + } + else + { { return NULL; } - } - case 'o': - if (strncmp (KR_keyword, "/dev/hdo", 8) == 0) - { + } + case 'k': + if (strncmp (KR_keyword, "/dev/sdk", 8) == 0) + { { -return &dev_hdo_storage; +return &dev_hdk_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'n': - if (strncmp (KR_keyword, "/dev/hdn", 8) == 0) - { + } + case 'j': + if (strncmp (KR_keyword, "/dev/sdj", 8) == 0) + { { -return &dev_hdn_storage; +return &dev_hdj_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'm': - switch (KR_keyword [5]) - { - case 'm': - if (strncmp (KR_keyword, "/dev/mem", 8) == 0) + } + case 'i': + if (strncmp (KR_keyword, "/dev/sdi", 8) == 0) { { -return &dev_mem_storage; +return &dev_hdi_storage; } } @@ -607,10 +610,10 @@ return NULL; } } case 'h': - if (strncmp (KR_keyword, "/dev/hdm", 8) == 0) + if (strncmp (KR_keyword, "/dev/sdh", 8) == 0) { { -return &dev_hdm_storage; +return &dev_hdh_storage; } } @@ -621,11 +624,11 @@ return NULL; } } - case 'c': - if (strncmp (KR_keyword, "/dev/com", 8) == 0) + case 'g': + if (strncmp (KR_keyword, "/dev/sdg", 8) == 0) { { -return &dev_serial_storage; +return &dev_hdg_storage; } } @@ -636,107 +639,131 @@ return NULL; } } - default: -{ -return NULL; - -} - } - case 'l': - if (strncmp (KR_keyword, "/dev/hdl", 8) == 0) - { + case 'f': + if (strncmp (KR_keyword, "/dev/sdf", 8) == 0) + { { -return &dev_hdl_storage; +return &dev_hdf_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'k': - if (strncmp (KR_keyword, "/dev/hdk", 8) == 0) - { + } + case 'e': + if (strncmp (KR_keyword, "/dev/sde", 8) == 0) + { { -return &dev_hdk_storage; +return &dev_hde_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'j': - if (strncmp (KR_keyword, "/dev/hdj", 8) == 0) - { + } + case 'd': + switch (KR_keyword [6]) + { + case 'd': + if (strncmp (KR_keyword, "/dev/sdd", 8) == 0) + { { -return &dev_hdj_storage; +return &dev_hdd_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'i': - if (strncmp (KR_keyword, "/dev/hdi", 8) == 0) - { + } + case 'c': + if (strncmp (KR_keyword, "/dev/scd", 8) == 0) + { { -return &dev_hdi_storage; +return &dev_cdrom_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'h': - if (strncmp (KR_keyword, "/dev/hdh", 8) == 0) - { -{ -return &dev_hdh_storage; - -} - } - else - { + } + default: { return NULL; } - } - case 'g': - if (strncmp (KR_keyword, "/dev/hdg", 8) == 0) - { + } + case 'c': + if (strncmp (KR_keyword, "/dev/sdc", 8) == 0) + { { -return &dev_hdg_storage; +return &dev_hdc_storage; } - } - else - { + } + else + { { return NULL; } - } - case 'f': - if (strncmp (KR_keyword, "/dev/hdf", 8) == 0) - { -{ -return &dev_hdf_storage; + } + case 'b': + if (strncmp (KR_keyword, "/dev/sdb", 8) == 0) + { +{ +return &dev_hdb_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'a': + if (strncmp (KR_keyword, "/dev/sda", 8) == 0) + { +{ +return &dev_hda_storage; + +} + } + else + { +{ +return NULL; + +} + } + default: +{ +return NULL; + +} + } + case 'n': + if (strncmp (KR_keyword, "/dev/nst", 8) == 0) + { +{ +return &dev_nst_storage; } } @@ -747,11 +774,11 @@ return NULL; } } - case 'e': - if (strncmp (KR_keyword, "/dev/hde", 8) == 0) + case 'm': + if (strncmp (KR_keyword, "/dev/mem", 8) == 0) { { -return &dev_hde_storage; +return &dev_mem_storage; } } @@ -762,14 +789,269 @@ return NULL; } } - case 'd': - switch (KR_keyword [5]) + case 'h': + switch (KR_keyword [7]) { + case 'z': + if (strncmp (KR_keyword, "/dev/hdz", 8) == 0) + { +{ +return &dev_hdz_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'y': + if (strncmp (KR_keyword, "/dev/hdy", 8) == 0) + { +{ +return &dev_hdy_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'x': + if (strncmp (KR_keyword, "/dev/hdx", 8) == 0) + { +{ +return &dev_hdx_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'w': + if (strncmp (KR_keyword, "/dev/hdw", 8) == 0) + { +{ +return &dev_hdw_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'v': + if (strncmp (KR_keyword, "/dev/hdv", 8) == 0) + { +{ +return &dev_hdv_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'u': + if (strncmp (KR_keyword, "/dev/hdu", 8) == 0) + { +{ +return &dev_hdu_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 't': + if (strncmp (KR_keyword, "/dev/hdt", 8) == 0) + { +{ +return &dev_hdt_storage; + +} + } + else + { +{ +return NULL; + +} + } case 's': - if (strncmp (KR_keyword, "/dev/scd", 8) == 0) + if (strncmp (KR_keyword, "/dev/hds", 8) == 0) { { -return &dev_cdrom_storage; +return &dev_hds_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'r': + if (strncmp (KR_keyword, "/dev/hdr", 8) == 0) + { +{ +return &dev_hdr_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'q': + if (strncmp (KR_keyword, "/dev/hdq", 8) == 0) + { +{ +return &dev_hdq_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'p': + if (strncmp (KR_keyword, "/dev/hdp", 8) == 0) + { +{ +return &dev_hdp_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'o': + if (strncmp (KR_keyword, "/dev/hdo", 8) == 0) + { +{ +return &dev_hdo_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'n': + if (strncmp (KR_keyword, "/dev/hdn", 8) == 0) + { +{ +return &dev_hdn_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'm': + if (strncmp (KR_keyword, "/dev/hdm", 8) == 0) + { +{ +return &dev_hdm_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'l': + if (strncmp (KR_keyword, "/dev/hdl", 8) == 0) + { +{ +return &dev_hdl_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'k': + if (strncmp (KR_keyword, "/dev/hdk", 8) == 0) + { +{ +return &dev_hdk_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'j': + if (strncmp (KR_keyword, "/dev/hdj", 8) == 0) + { +{ +return &dev_hdj_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'i': + if (strncmp (KR_keyword, "/dev/hdi", 8) == 0) + { +{ +return &dev_hdi_storage; } } @@ -781,6 +1063,66 @@ return NULL; } } case 'h': + if (strncmp (KR_keyword, "/dev/hdh", 8) == 0) + { +{ +return &dev_hdh_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'g': + if (strncmp (KR_keyword, "/dev/hdg", 8) == 0) + { +{ +return &dev_hdg_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'f': + if (strncmp (KR_keyword, "/dev/hdf", 8) == 0) + { +{ +return &dev_hdf_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'e': + if (strncmp (KR_keyword, "/dev/hde", 8) == 0) + { +{ +return &dev_hde_storage; + +} + } + else + { +{ +return NULL; + +} + } + case 'd': if (strncmp (KR_keyword, "/dev/hdd", 8) == 0) { { @@ -795,32 +1137,62 @@ return NULL; } } - default: + case 'c': + if (strncmp (KR_keyword, "/dev/hdc", 8) == 0) + { +{ +return &dev_hdc_storage; + +} + } + else + { { return NULL; } - } - case 'c': - if (strncmp (KR_keyword, "/dev/hdc", 8) == 0) - { + } + case 'b': + if (strncmp (KR_keyword, "/dev/hdb", 8) == 0) + { { -return &dev_hdc_storage; +return &dev_hdb_storage; } - } - else - { + } + else + { +{ +return NULL; + +} + } + case 'a': + if (strncmp (KR_keyword, "/dev/hda", 8) == 0) + { +{ +return &dev_hda_storage; + +} + } + else + { +{ +return NULL; + +} + } + default: { return NULL; } } - case 'b': - if (strncmp (KR_keyword, "/dev/hdb", 8) == 0) + case 'd': + if (strncmp (KR_keyword, "/dev/dsp", 8) == 0) { { -return &dev_hdb_storage; +return &dev_oss_dsp_storage; } } @@ -831,11 +1203,11 @@ return NULL; } } - case 'a': - if (strncmp (KR_keyword, "/dev/hda", 8) == 0) + case 'c': + if (strncmp (KR_keyword, "/dev/com", 8) == 0) { { -return &dev_hda_storage; +return &dev_serial_storage; } } diff --git a/winsup/cygwin/devices.shilka b/winsup/cygwin/devices.shilka index 174f99ef0..4f135ade1 100644 --- a/winsup/cygwin/devices.shilka +++ b/winsup/cygwin/devices.shilka @@ -308,6 +308,32 @@ const device *uniq_devices[] = "/dev/hdx" = hdx {return &dev_hdx_storage;} "/dev/hdy" = hdy {return &dev_hdy_storage;} "/dev/hdz" = hdz {return &dev_hdz_storage;} +"/dev/sda" = hda {return &dev_hda_storage;} +"/dev/sdb" = hdb {return &dev_hdb_storage;} +"/dev/sdc" = hdc {return &dev_hdc_storage;} +"/dev/sdd" = hdd {return &dev_hdd_storage;} +"/dev/sde" = hde {return &dev_hde_storage;} +"/dev/sdf" = hdf {return &dev_hdf_storage;} +"/dev/sdg" = hdg {return &dev_hdg_storage;} +"/dev/sdh" = hdh {return &dev_hdh_storage;} +"/dev/sdi" = hdi {return &dev_hdi_storage;} +"/dev/sdj" = hdj {return &dev_hdj_storage;} +"/dev/sdk" = hdk {return &dev_hdk_storage;} +"/dev/sdl" = hdl {return &dev_hdl_storage;} +"/dev/sdm" = hdm {return &dev_hdm_storage;} +"/dev/sdn" = hdn {return &dev_hdn_storage;} +"/dev/sdo" = hdo {return &dev_hdo_storage;} +"/dev/sdp" = hdp {return &dev_hdp_storage;} +"/dev/sdq" = hdq {return &dev_hdq_storage;} +"/dev/sdr" = hdr {return &dev_hdr_storage;} +"/dev/sds" = hds {return &dev_hds_storage;} +"/dev/sdt" = hdt {return &dev_hdt_storage;} +"/dev/sdu" = hdu {return &dev_hdu_storage;} +"/dev/sdv" = hdv {return &dev_hdv_storage;} +"/dev/sdw" = hdw {return &dev_hdw_storage;} +"/dev/sdx" = hdx {return &dev_hdx_storage;} +"/dev/sdy" = hdy {return &dev_hdy_storage;} +"/dev/sdz" = hdz {return &dev_hdz_storage;} "/dev/rawdrive" = rawdrive {return &dev_rawdrive_storage;} %other {return NULL;} %% -- 2.43.5