Index: uspace/dist/src/bithenge/basic.bh =================================================================== --- uspace/dist/src/bithenge/basic.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/basic.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,11 @@ +transform main = struct { + .u8 <- uint8; + .u16le <- uint16le; + .u16be <- uint16be; + .u32le <- uint32le; + .u32be <- uint32be; + .u64le <- uint64le; + .u64be <- uint64be; + .empty_blob <- known_length(0); + .ascii <- ascii <- known_length(8); +}; Index: uspace/dist/src/bithenge/basic.dat =================================================================== --- uspace/dist/src/bithenge/basic.dat (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/basic.dat (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,2 @@ +ªðð!Ce‡‡eC!þܺ˜vT22Tv˜ºÜþ0~ +\"'  Index: uspace/dist/src/bithenge/basic.out =================================================================== --- uspace/dist/src/bithenge/basic.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/basic.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,11 @@ +{ + "u8": 170, + "u16le": 4080, + "u16be": 4080, + "u32le": 2271560481, + "u32be": 2271560481, + "u64le": 1167088121787636990, + "u64be": 1167088121787636990, + "empty_blob": b"", + "ascii": "0~\u000a\\\"'\u0009\u001b" +} Index: uspace/dist/src/bithenge/bits.bh =================================================================== --- uspace/dist/src/bithenge/bits.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/bits.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,25 @@ +transform main = struct { + .bits_le <- repeat(8) { bit } <- bits_le <- known_length(1); + .bits_be <- repeat(8) { bit } <- bits_be <- known_length(1); + <- struct { + .le0 <- uint_le(0); + .le1 <- uint_le(1); + .le2 <- uint_le(2); + .le3 <- uint_le(3); + .le4 <- uint_le(4); + .le5 <- uint_le(5); + .le6 <- uint_le(6); + .le7 <- uint_le(7); + .le8 <- uint_le(8); + + .be8 <- uint_be(8); + .be7 <- uint_be(7); + .be6 <- uint_be(6); + .be5 <- uint_be(5); + .be4 <- uint_be(4); + .be3 <- uint_be(3); + .be2 <- uint_be(2); + .be1 <- uint_be(1); + .be0 <- uint_be(0); + } <- bits_be <- known_length(9); +}; Index: uspace/dist/src/bithenge/bits.dat =================================================================== --- uspace/dist/src/bithenge/bits.dat (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/bits.dat (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,1 @@ +ee¤BB% Index: uspace/dist/src/bithenge/bits.out =================================================================== --- uspace/dist/src/bithenge/bits.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/bits.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,40 @@ +{ + "bits_le": { + 0: True, + 1: False, + 2: True, + 3: False, + 4: False, + 5: True, + 6: True, + 7: False + }, + "bits_be": { + 0: False, + 1: True, + 2: True, + 3: False, + 4: False, + 5: True, + 6: False, + 7: True + }, + "le0": 0, + "le1": 1, + "le2": 2, + "le3": 4, + "le4": 8, + "le5": 16, + "le6": 32, + "le7": 64, + "le8": 128, + "be8": 128, + "be7": 64, + "be6": 32, + "be5": 16, + "be4": 8, + "be3": 4, + "be2": 2, + "be1": 1, + "be0": 0 +} Index: uspace/dist/src/bithenge/cond.bh =================================================================== --- uspace/dist/src/bithenge/cond.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/cond.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,36 @@ +transform pascal_string = struct { + <- struct { # An inner struct for testing purposes + .len <- uint8; + }; + .string <- ascii <- known_length(.len); +}; + +transform u32(little_endian) = + if (little_endian) { + uint32le + } else { + uint32be + }; + +transform item(little_endian, len) = struct { + .type <- (3 * in + 1) <- u32(little_endian); + .name <- pascal_string; + switch (.type) { + 10: { + .val <- u32(little_endian); + }; + 11: { + .text <- ascii <- known_length(len); + }; + else: { + .unknown <- known_length(len); + }; + } +}; + +transform main() = struct { + .first_len <- (3); + .second_len <- (6 - 2); + .first_item <- item(true, .first_len); + .second_item <- item(false, .second_len); +}; Index: uspace/dist/src/bithenge/cond.out =================================================================== --- uspace/dist/src/bithenge/cond.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/cond.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,20 @@ +{ + "first_len": 3, + "second_len": 4, + "first_item": { + "type": 52, + "name": { + "len": 6, + "string": "Item 1" + }, + "unknown": b"\xcf\x80\x78" + }, + "second_item": { + "type": 10, + "name": { + "len": 6, + "string": "Item 2" + }, + "val": 12345 + } +} Index: uspace/dist/src/bithenge/expression.bh =================================================================== --- uspace/dist/src/bithenge/expression.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/expression.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,54 @@ +transform compare_ints(a, b) = struct { + .l <- (a < b); + .g <- (a > b); + .ge <- (a >= b); + .le <- (a <= b); + .eq <- (a == b); + .ne <- (a != b); +}; + +transform arithmetic(a, b) = struct { + .sum <- (a + b); + .difference <- (a - b); + .product <- (a * b); + if (b > 0) { + .quotient <- (a // b); + .remainder <- (a % b); + } +}; + +transform concat_bits(a, b) = uint_le(24) <- (in.concat_bits) <- struct { + .bits0 <- bits_le <- (a); + .bits1 <- bits_be <- (b); + .concat_bits <- (.bits0 ++ (.bits1 ++ .bits0)); +}; + +transform equality(bytes0, bytes1, str0, str1) = struct { + .neqs <- ((0 != 1) != (2 != 3)); + .bytes0_eq_bytes1 <- (bytes0 == bytes1); + .bytes0_ne_bytes0 <- (bytes0 != bytes0); + .str0_ne_str1 <- (str0 != str1); + .str1_eq_str1 <- (str1 == str1); + .bytes1_eq_1 <- (bytes1 == 1); +}; + +transform subblob(bytes0) = struct { + .subblob <- (bytes0[0:][0,1][0:1]); +}; + +transform main = struct { + .bytes0 <- known_length(1); + .bytes1 <- known_length(1); + .str0 <- ascii <- (.bytes0); + .str1 <- ascii <- (.bytes1); + .compare_ints_0_1 <- compare_ints(0, 1); + .compare_ints_0_0 <- compare_ints(0, 0); + .compare_ints_1_0 <- compare_ints(1, 0); + .arithmetic_0_1 <- arithmetic(0, 1); + .arithmetic_17_n3 <- arithmetic(17, 0 - 3); + .arithmetic_n17_3 <- arithmetic(0 - 17, 3); + .concat_bytes <- (.bytes0 ++ (.bytes1 ++ .bytes0)); + .concat_bits <- concat_bits(.bytes0, .bytes1); + .equality <- equality(.bytes0, .bytes1, .str0, .str1); + .subblob <- subblob(.bytes0); +}; Index: uspace/dist/src/bithenge/expression.dat =================================================================== --- uspace/dist/src/bithenge/expression.dat (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/expression.dat (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,1 @@ +17 Index: uspace/dist/src/bithenge/expression.out =================================================================== --- uspace/dist/src/bithenge/expression.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/expression.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,62 @@ +{ + "bytes0": b"\x31", + "bytes1": b"\x37", + "str0": "1", + "str1": "7", + "compare_ints_0_1": { + "l": True, + "g": False, + "ge": False, + "le": True, + "eq": False, + "ne": True + }, + "compare_ints_0_0": { + "l": False, + "g": False, + "ge": True, + "le": True, + "eq": True, + "ne": False + }, + "compare_ints_1_0": { + "l": False, + "g": True, + "ge": True, + "le": False, + "eq": False, + "ne": True + }, + "arithmetic_0_1": { + "sum": 1, + "difference": -1, + "product": 0, + "quotient": 0, + "remainder": 0 + }, + "arithmetic_17_n3": { + "sum": 14, + "difference": 20, + "product": -51 + }, + "arithmetic_n17_3": { + "sum": -14, + "difference": -20, + "product": -51, + "quotient": -6, + "remainder": 1 + }, + "concat_bytes": b"\x31\x37\x31", + "concat_bits": 3271729, + "equality": { + "neqs": False, + "bytes0_eq_bytes1": False, + "bytes0_ne_bytes0": False, + "str0_ne_str1": True, + "str1_eq_str1": True, + "bytes1_eq_1": False + }, + "subblob": { + "subblob": b"\x31" + } +} Index: uspace/dist/src/bithenge/fat.bh =================================================================== --- uspace/dist/src/bithenge/fat.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/fat.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,168 @@ +# Copyright (c) 2012 Sean Bartell +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# FAT filesystem script. +# Largely based on https://en.wikipedia.org/wiki/File_Allocation_Table +# Currently only FAT12 and FAT16 are supported. + +transform u8 = uint8; +transform u16 = uint16le; +transform u32 = uint32le; + +transform fat_attributes = struct { + .read_only <- bit; + .hidden <- bit; + .system <- bit; + .volume_label <- bit; + .subdirectory <- bit; + .archive <- bit; + .device <- bit; + .reserved <- bit; +} <- bits_le <- known_length(1); + +transform file_data(data, bits, fat, cluster_size, start) = (in.data) <- struct { + .cluster <- (data[(start-2)*cluster_size, cluster_size]); + .last_cluster_number <- switch (bits) { + 12: (488); # 0x00000ff8 + 16: (65528); # 0x0000fff8 + 32: (268435448); # 0x0ffffff8 + }; + .next <- (fat[start]); + if (.next == 0 || .next >= .last_cluster_number) { + .data <- (.cluster); + } else { + .rest <- file_data(data, bits, fat, cluster_size, .next) <- known_length(0); + .data <- (.cluster ++ .rest); + } +}; + +transform fat_dir_entry(data, bits, fat, cluster_size, self_start, parent) = struct { + .filename <- known_length(8); + .extension <- known_length(3); + .attrs <- fat_attributes; + .flags <- u8; + .ctime_fine <- u8; + .ctime <- u16; + .cdate <- u16; + .adate <- u16; + .permissions <- u16; + .mtime <- u16; + .mdate <- u16; + .start <- u16; + .size <- u32; + .size_shown <- if (.size > 32) { (32) } else { (.size) }; + + if (.start != 0 && .start != self_start && .start != parent && .filename[0] != 229) { + .data + <- if (.attrs.subdirectory) { + repeat { fat_dir_entry(data, bits, fat, cluster_size, .start, self_start) } + } else { + (in[0,.size_shown]) + } + <- if (.size != 0) { (in[0,.size]) } else { (in) } + <- file_data(data, bits, fat, cluster_size, .start); + } +}; + +transform fat_table(bits, num_clusters) = switch (bits) { + 12: partial {repeat(num_clusters) { uint_le(12) }} <- bits_le; + 16: partial {repeat(num_clusters) { u16 }}; + 32: partial {repeat(num_clusters) { u32 }}; +}; + +transform fat_super(disk) = struct { + .jump_instruction <- known_length(3); + .oem_name <- ascii <- known_length(8); + + # DOS 2.0 BPB + .bytes_per_sector <- u16; # must be power of two, at least 32 + .sectors_per_cluster <- u8; # must be power of two + .num_reserved_sectors <- u16; + .num_fats <- u8; # at least 1 + .num_root_entries <- u16; # 0 for FAT32 + .num_sectors_16 <- u16; + .media_descriptor <- u8; + .sectors_per_fat <- u16; # 0 for FAT32 + + # DOS 3.0/3.2/3.31 BPB + .sectors_per_track <- u16; + .num_heads <- u16; + + # DOS 3.31 BPB + .bpb331 <- struct { + .ignore <- nonzero_boolean <- (.num_sectors_16); + .num_hidden_sectors <- u32; + .num_sectors_32 <- u32; + }; + + .drive_number <- u8; + .chkdsk_flags <- u8; + .extended_boot_signature <- u8; + if (.extended_boot_signature == 41) { + .volume_id <- u32; + .volume_label <- ascii <- known_length(11); + .type <- ascii <- known_length(8); + } + + .boot_signature <- (disk[510,2]); # b"\x55\xaa"; TODO: what if .bytes_per_sector < 512? +}; + +transform fat_filesystem_tree(disk) = struct { + .super <- partial{fat_super(disk)} <- (disk); + + .num_sectors <- if (.super.bpb331.ignore) { + (.super.num_sectors_16) + } else { + (.super.bpb331.num_sectors_32) + }; + + .cluster_size <- (.super.sectors_per_cluster * .super.bytes_per_sector); + .first_root_sector <- (.super.num_reserved_sectors + .super.num_fats * .super.sectors_per_fat); + .first_data_sector <- (.first_root_sector + + (.super.num_root_entries * 32 + .super.bytes_per_sector - 1) // + .super.bytes_per_sector); + .num_clusters <- (2 + (.num_sectors - .first_data_sector) // .super.sectors_per_cluster); + .bits <- if (.num_clusters < 4085) { (12) } + else { if (.num_clusters < 65525) { (16) } else { (32) } }; + + .fats <- partial(.super.num_reserved_sectors * .super.bytes_per_sector) { + repeat(.super.num_fats) { + fat_table(.bits, .num_clusters) <- + known_length(.super.sectors_per_fat * .super.bytes_per_sector) + } + } <- (disk); + + .root <- partial(.first_root_sector * .super.bytes_per_sector) { + repeat(.super.num_root_entries) { + fat_dir_entry(disk[.first_data_sector * .super.bytes_per_sector:], + .bits, .fats[0], .cluster_size, 0, 0) + } + } <- (disk); +}; + +transform fat_filesystem = partial {fat_filesystem_tree(in)}; + +transform main = fat_filesystem; Index: uspace/dist/src/bithenge/fat.out =================================================================== --- uspace/dist/src/bithenge/fat.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/fat.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,908 @@ +{ + "super": { + "jump_instruction": b"\xeb\x3c\x90", + "oem_name": "mkdosfs", + "bytes_per_sector": 512, + "sectors_per_cluster": 1, + "num_reserved_sectors": 1, + "num_fats": 1, + "num_root_entries": 16, + "num_sectors_16": 66, + "media_descriptor": 248, + "sectors_per_fat": 1, + "sectors_per_track": 32, + "num_heads": 64, + "bpb331": { + "ignore": True, + "num_hidden_sectors": 0, + "num_sectors_32": 0 + }, + "drive_number": 0, + "chkdsk_flags": 0, + "extended_boot_signature": 41, + "volume_id": 1045880152, + "volume_label": "Test ", + "type": "FAT12 ", + "boot_signature": b"\x55\xaa" + }, + "num_sectors": 66, + "cluster_size": 512, + "first_root_sector": 2, + "first_data_sector": 3, + "num_clusters": 65, + "bits": 12, + "fats": { + 0: { + 0: 4088, + 1: 4095, + 2: 0, + 3: 4095, + 4: 0, + 5: 0, + 6: 0, + 7: 0, + 8: 0, + 9: 0, + 10: 0, + 11: 0, + 12: 0, + 13: 0, + 14: 0, + 15: 0, + 16: 0, + 17: 0, + 18: 0, + 19: 0, + 20: 0, + 21: 0, + 22: 0, + 23: 0, + 24: 0, + 25: 0, + 26: 0, + 27: 0, + 28: 0, + 29: 0, + 30: 0, + 31: 0, + 32: 0, + 33: 0, + 34: 0, + 35: 0, + 36: 0, + 37: 38, + 38: 4095, + 39: 0, + 40: 0, + 41: 0, + 42: 0, + 43: 0, + 44: 0, + 45: 0, + 46: 0, + 47: 0, + 48: 0, + 49: 0, + 50: 0, + 51: 0, + 52: 0, + 53: 0, + 54: 0, + 55: 0, + 56: 0, + 57: 0, + 58: 0, + 59: 0, + 60: 0, + 61: 0, + 62: 0, + 63: 0, + 64: 0 + } + }, + "root": { + 0: { + "filename": b"\x54\x65\x73\x74\x20\x20\x20\x20", + "extension": b"\x20\x20\x20", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": True, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 35030, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 35030, + "mdate": 16658, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 1: { + "filename": b"\x41\x73\x00\x75\x00\x62\x00\x64", + "extension": b"\x00\x69\x00", + "attrs": { + "read_only": True, + "hidden": True, + "system": True, + "volume_label": True, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 173, + "ctime": 114, + "cdate": 0, + "adate": 65535, + "permissions": 65535, + "mtime": 65535, + "mdate": 65535, + "start": 0, + "size": 4294967295, + "size_shown": 32 + }, + 2: { + "filename": b"\x53\x55\x42\x44\x49\x52\x20\x20", + "extension": b"\x20\x20\x20", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": True, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 100, + "ctime": 43267, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43290, + "mdate": 16658, + "start": 3, + "size": 0, + "size_shown": 0, + "data": { + 0: { + "filename": b"\x2e\x20\x20\x20\x20\x20\x20\x20", + "extension": b"\x20\x20\x20", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": True, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 100, + "ctime": 43236, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43236, + "mdate": 16658, + "start": 3, + "size": 0, + "size_shown": 0 + }, + 1: { + "filename": b"\x2e\x2e\x20\x20\x20\x20\x20\x20", + "extension": b"\x20\x20\x20", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": True, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 100, + "ctime": 43236, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43236, + "mdate": 16658, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 2: { + "filename": b"\xe5\x2e\x00\x66\x00\x69\x00\x6c", + "extension": b"\x00\x65\x00", + "attrs": { + "read_only": True, + "hidden": True, + "system": True, + "volume_label": True, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 103, + "ctime": 46, + "cdate": 116, + "adate": 120, + "permissions": 116, + "mtime": 46, + "mdate": 115, + "start": 0, + "size": 7340151, + "size_shown": 32 + }, + 3: { + "filename": b"\xe5\x49\x4c\x45\x54\x58\x7e\x31", + "extension": b"\x53\x57\x50", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": True, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 43287, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43287, + "mdate": 16658, + "start": 13, + "size": 12288, + "size_shown": 32 + }, + 4: { + "filename": b"\x41\x66\x00\x69\x00\x6c\x00\x65", + "extension": b"\x00\x2e\x00", + "attrs": { + "read_only": True, + "hidden": True, + "system": True, + "volume_label": True, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 25, + "ctime": 116, + "cdate": 120, + "adate": 116, + "permissions": 0, + "mtime": 65535, + "mdate": 65535, + "start": 0, + "size": 4294967295, + "size_shown": 32 + }, + 5: { + "filename": b"\x46\x49\x4c\x45\x20\x20\x20\x20", + "extension": b"\x54\x58\x54", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": True, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 43290, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43290, + "mdate": 16658, + "start": 37, + "size": 951, + "size_shown": 32, + "data": b"\x22\x4a\x61\x62\x62\x65\x72\x77\x6f\x63\x6b\x79\x22\x0a\x0a\x27\x54\x77\x61\x73\x20\x62\x72\x69\x6c\x6c\x69\x67\x2c\x20\x61\x6e" + }, + 6: { + "filename": b"\xe5\x2e\x00\x66\x00\x69\x00\x6c", + "extension": b"\x00\x65\x00", + "attrs": { + "read_only": True, + "hidden": True, + "system": True, + "volume_label": True, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 111, + "ctime": 46, + "cdate": 116, + "adate": 120, + "permissions": 116, + "mtime": 46, + "mdate": 115, + "start": 0, + "size": 7864439, + "size_shown": 32 + }, + 7: { + "filename": b"\xe5\x49\x4c\x45\x54\x58\x7e\x31", + "extension": b"\x53\x57\x58", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": True, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 100, + "ctime": 43267, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43267, + "mdate": 16658, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 8: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 9: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 10: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 11: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 12: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 13: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 14: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 15: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + } + } + }, + 3: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 4: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 5: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 6: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 7: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 8: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 9: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 10: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 11: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 12: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 13: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 14: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 15: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + } + } +} Index: uspace/dist/src/bithenge/gif/gif.bh =================================================================== --- uspace/dist/src/bithenge/gif/gif.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/gif/gif.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,148 @@ +# +# Copyright (c) 2012 Vojtech Horky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +# +# Graphics Interchange Format (image/gif) +# + + +transform chars(len) = ascii <- known_length(len); +transform word = uint16le; + + + +transform gif_signature = chars(3); + +transform gif_version = chars(3); + +transform gif_color_map_entry = struct { + .red <- uint8; + .green <- uint8; + .blue <- uint8; +}; + +transform gif_color_map(length) = repeat(length) { + gif_color_map_entry +}; + +transform gif_color_map_from_bits_per_pixel(bits_per_pixel) = struct { + # We need to emulate missing << operator + switch (bits_per_pixel) { + 1: { <- gif_color_map(2); }; + 2: { <- gif_color_map(4); }; + 3: { <- gif_color_map(8); }; + 4: { <- gif_color_map(16); }; + 5: { <- gif_color_map(32); }; + 6: { <- gif_color_map(64); }; + 7: { <- gif_color_map(128); }; + 8: { <- gif_color_map(256); }; + } +}; + + +# Process GIF data block: +# - first byte denotes block size (.length) +# - followed by .length bytes of the actual data (not processed here) +# - followed by next block or terminator (zero) +transform generic_data_block = do { + struct { + .length <- uint8; + .has_next <- nonzero_boolean <- (.length); + if (.has_next) { + .data <- known_length(.length); + } + } +} while (.has_next); + + +transform gif_image_block = struct { + .left <- word; + .top <- word; + .width <- word; + .height <- word; + + <- struct { + .use_local_color_map <- bit; + .interlacing <- bit; + .reserved_bits <- uint_be(3); + .bits_per_pixel <- (in + 1) <- uint_be(3); + } <- bits_be <- known_length(1); + + if (.use_local_color_map) { + .local_color_map <- gif_color_map_from_bits_per_pixel(.bits_per_pixel); + } + + .lzw_initial_size <- uint8; + .lzw_data <- generic_data_block; +}; + +# TODO: interpret known extensions +transform gif_extension = struct { + .function <- uint8; + .data <- generic_data_block; +}; + +# Switch over known blocks (image, extensions, end) +transform gif_block = struct { + .kind <- uint8; + switch (.kind) { + 33: { # exclamation mark -> extension block + .extension <- gif_extension; + }; + 44: { # comma -> image + .image <- gif_image_block; + }; + 59: { # semicolon -> terminator + .after_terminator <- repeat { uint8 }; + }; + else: { + .unknown <- repeat { uint8 }; + }; + } +}; + +transform main = struct { + .signature <- gif_signature; + .version <- gif_version; + .width <- word; + .height <- word; + <- struct { + .global_color_map_exists <- bit; + .color_resolution <- uint_be(3); + .reserved_bit <- uint_be(1); + .bits_per_pixel <- (in + 1) <- uint_be(3); + } <- bits_be <- known_length(1); + .background_color_index <- uint8; + .reserved <- uint8; + if (.global_color_map_exists) { + .global_color_map <- gif_color_map_from_bits_per_pixel(.bits_per_pixel); + } + .blocks <- repeat { + gif_block + }; +}; Index: uspace/dist/src/bithenge/gif/readme =================================================================== --- uspace/dist/src/bithenge/gif/readme (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/gif/readme (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,9 @@ + +File `loader.gif' was retrieved from + http://www.ajaxload.info/ +using default settings. + +File `blue_1x1.gif' was generated with ImageMagick using command + convert -size 1x1 xc:blue gif87:blue_1x1.gif + +File `helenos.gif' is a converted uspace/srv/hid/console/gfx/helenos.tga. Index: uspace/dist/src/bithenge/repeat.bh =================================================================== --- uspace/dist/src/bithenge/repeat.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/repeat.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,27 @@ +transform with_count = struct { + .none <- repeat(0) { uint8 }; + .one <- repeat(1) { uint8 }; + .count <- uint8; + if (true) { # test whether .count is still accessible + .many <- repeat(.count) { uint8 }; + } +}; + +transform without_count = struct { + .until_error <- repeat { uint8 <- zero_terminated }; + .until_end <- repeat { uint8 }; +}; + +transform do_while = do { + struct { + .valid <- nonzero_boolean <- uint8; + .val <- uint8; + } +} while (.valid); + +transform main = struct { + .with_count <- with_count; + .without_count <- without_count <- known_length(9); + .do_while <- do_while; + .do_while_item <- (.do_while[1]); +}; Index: uspace/dist/src/bithenge/repeat.out =================================================================== --- uspace/dist/src/bithenge/repeat.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/repeat.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,48 @@ +{ + "with_count": { + "none": {}, + "one": { + 0: 127 + }, + "count": 7, + "many": { + 0: 2, + 1: 3, + 2: 5, + 3: 7, + 4: 11, + 5: 13, + 6: 17 + } + }, + "without_count": { + "until_error": { + 0: 2, + 1: 4, + 2: 8 + }, + "until_end": { + 0: 16, + 1: 32, + 2: 64 + } + }, + "do_while": { + 0: { + "valid": True, + "val": 1 + }, + 1: { + "valid": True, + "val": 4 + }, + 2: { + "valid": False, + "val": 9 + } + }, + "do_while_item": { + "valid": True, + "val": 4 + } +} Index: uspace/dist/src/bithenge/test.bdsh =================================================================== --- uspace/dist/src/bithenge/test.bdsh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/test.bdsh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,25 @@ +bithenge basic.bh basic.dat | to /tmp/bithenge-test.out +cmp basic.out /tmp/bithenge-test.out + +bithenge bits.bh bits.dat | to /tmp/bithenge-test.out +cmp bits.out /tmp/bithenge-test.out + +bithenge cond.bh cond.dat | to /tmp/bithenge-test.out +cmp cond.out /tmp/bithenge-test.out + +bithenge expression.bh expression.dat | to /tmp/bithenge-test.out +cmp expression.out /tmp/bithenge-test.out + +bithenge fat.bh fat.dat | to /tmp/bithenge-test.out +cmp fat.out /tmp/bithenge-test.out + +bithenge repeat.bh repeat.dat | to /tmp/bithenge-test.out +cmp repeat.out /tmp/bithenge-test.out + +bithenge trip.bh trip.dat | to /tmp/bithenge-test.out +cmp trip.out /tmp/bithenge-test.out + +bithenge usbdesc.bh usbdesc.kbd.dat | to /tmp/bithenge-test.out +cmp usbdesc.kbd.out /tmp/bithenge-test.out + +echo Success Index: uspace/dist/src/bithenge/test.sh =================================================================== --- uspace/dist/src/bithenge/test.sh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/test.sh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,33 @@ +#!/bin/bash +shopt -s nullglob +set -e + +BITHENGE=../../../app/bithenge/bithenge + +if type valgrind >/dev/null 2>&1 +then + BITHENGE="valgrind -q --show-reachable=yes --error-exitcode=64 ${BITHENGE}" +else + echo "Valgrind not found." +fi + +test_file() { + echo "Testing $1 on $2..." + ${BITHENGE} $1 $2 2>&1|diff $3 - +} + +for BH in *.bh +do + for DAT in $(basename ${BH} .bh).dat $(basename ${BH} .bh).*.dat + do + OUT=$(basename ${DAT} .dat).out + [ -e ${DAT} ] || continue + [ -e ${OUT} ] || continue + test_file ${BH} ${DAT} ${OUT} + done +done + +test_file trip.bh file:trip.dat trip.out +test_file repeat.bh hex:7f07020305070b0D11020004000800102040010101040009 repeat.out + +echo "Done!" Index: uspace/dist/src/bithenge/trip.bh =================================================================== --- uspace/dist/src/bithenge/trip.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/trip.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,15 @@ +transform point = struct { + .lat <- uint32le; + .lon <- uint32le; +}; + +transform named_point = struct { + .name <- ascii <- zero_terminated; + <- point; +}; + +transform main = struct { + .from <- named_point; + .to <- named_point; + .distance <- uint32le; # in kilometers +}; Index: uspace/dist/src/bithenge/trip.out =================================================================== --- uspace/dist/src/bithenge/trip.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/trip.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,13 @@ +{ + "from": { + "name": "Raleigh", + "lat": 36, + "lon": 79 + }, + "to": { + "name": "Denver", + "lat": 40, + "lon": 105 + }, + "distance": 2353 +} Index: uspace/dist/src/bithenge/usbdesc.bh =================================================================== --- uspace/dist/src/bithenge/usbdesc.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/usbdesc.bh (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,68 @@ +## +## +## USB DESCRIPTORS +## +## + +# Originally by Vojtech Horky. + +# Block prefixed with a byte length +transform block = (in.data) <- struct { + .bLength <- uint8; + .data <- known_length(.bLength - 1); +}; + +# USB configuration descriptor +# This is not the full configuration descriptor (i.e. with interface +# and endpoint descriptors included) but only the header. +transform usb_configuration_descriptor_bare = struct { + .wTotalLength <- uint16le; + .bNumInterfaces <- uint8; + .bConfigurationValue <- uint8; + .iConfiguration <- uint8; + .bmAttributes <- uint8; + .MaxPower <- uint8; +}; + +# USB interface descriptor +transform usb_interface_descriptor = struct { + .bInterfaceNumber <- uint8; + .bAlternateSetting <- uint8; + .bNumEndpoints <- uint8; + .bInterfaceClass <- uint8; + .bInterfaceSubClass <- uint8; + .bInterfaceProtocol <- uint8; + .iInterface <- uint8; +}; + +# USB endpoint descriptor +transform usb_endpoint_descriptor = struct { + .bEndpointAddress <- uint8; + .bmAttributes <- uint8; + .wMaxPacketSize <- uint16le; + .bInterval <- uint8; +}; + +# USB HID descriptor +transform usb_hid_descriptor = struct { + .bcdHID <- uint16le; + .bCountryCode <- uint8; + .bNumDescriptors <- uint8; + <- repeat(.bNumDescriptors) { struct { + .bDescriptorType <- uint8; + .wDescriptorLength <- uint16le; + } }; +}; + +# USB descriptor +transform usb_descriptor = struct { + .bDescriptorType <- uint8; + <- switch (.bDescriptorType) { + 2: usb_configuration_descriptor_bare; + 4: usb_interface_descriptor; + 5: usb_endpoint_descriptor; + 33: usb_hid_descriptor; + }; +} <- block; + +transform main = repeat { usb_descriptor }; Index: uspace/dist/src/bithenge/usbdesc.kbd.out =================================================================== --- uspace/dist/src/bithenge/usbdesc.kbd.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) +++ uspace/dist/src/bithenge/usbdesc.kbd.out (revision be1dcc2699d4c96f7d72aa17f9743e49dfc9ec30) @@ -0,0 +1,38 @@ +{ + 0: { + "bDescriptorType": 2, + "wTotalLength": 34, + "bNumInterfaces": 1, + "bConfigurationValue": 1, + "iConfiguration": 8, + "bmAttributes": 160, + "MaxPower": 50 + }, + 1: { + "bDescriptorType": 4, + "bInterfaceNumber": 0, + "bAlternateSetting": 0, + "bNumEndpoints": 1, + "bInterfaceClass": 9, + "bInterfaceSubClass": 1, + "bInterfaceProtocol": 1, + "iInterface": 0 + }, + 2: { + "bDescriptorType": 33, + "bcdHID": 273, + "bCountryCode": 0, + "bNumDescriptors": 1, + 0: { + "bDescriptorType": 34, + "wDescriptorLength": 63 + } + }, + 3: { + "bDescriptorType": 5, + "bEndpointAddress": 129, + "bmAttributes": 3, + "wMaxPacketSize": 8, + "bInterval": 10 + } +}