diff --git a/iso9660/byte_position.py b/iso9660/byte_position.py index 3c13644..ad21126 100644 --- a/iso9660/byte_position.py +++ b/iso9660/byte_position.py @@ -36,6 +36,8 @@ def sanitize_field_name(name): def sanitize_content_name(name): if name == 'Numerical value': return 'numerical_value' + elif name == '8 bits': + return 'numerical_value' else: return 'bytes' diff --git a/iso9660/byte_position_java.py b/iso9660/byte_position_java.py index c0633b5..4bf4d2d 100644 --- a/iso9660/byte_position_java.py +++ b/iso9660/byte_position_java.py @@ -39,7 +39,7 @@ def render_fields(input_name, fields): yield f"public static final int {field.name.upper()}_START = {field.start - 1};" yield f"public static final int {field.name.upper()}_END = {field.end - 1};" - yield f"{pascalcase(input_name)}(byte[] array, int offset) {{" + yield f"public {pascalcase(input_name)}(byte[] array, int offset) {{" yield "super(array, offset);" yield "}" diff --git a/regs/gdrom.csv b/regs/gdrom.csv index 636fa7e..a166c49 100644 --- a/regs/gdrom.csv +++ b/regs/gdrom.csv @@ -1,14 +1,14 @@ -"address","size","name","r/w","description" -"0018","1","alternate_status","R", -"0018","1","device_control","W", -"0080","2","data","RW", -"0084","1","error","R", -"0084","1","features","W", -"0088","1","interrupt_reason","R", -"0088","1","sector_count","W", -"008C","1","sector_number","R", -"0090","1","byte_count_low","RW", -"0094","1","byte_count_high","RW", -"0098","1","drive_select","RW", -"009C","1","status","R", -"009C","1","command","W", +"block","address","size","name","r/w","description" +"gdrom","0018","1","alternate_status","R", +"gdrom","0018","1","device_control","W", +"gdrom","0080","2","data","RW", +"gdrom","0084","1","error","R", +"gdrom","0084","1","features","W", +"gdrom","0088","1","interrupt_reason","R", +"gdrom","0088","1","sector_count","W", +"gdrom","008C","1","sector_number","R", +"gdrom","0090","1","byte_count_low","RW", +"gdrom","0094","1","byte_count_high","RW", +"gdrom","0098","1","drive_select","RW", +"gdrom","009C","1","status","R", +"gdrom","009C","1","command","W", diff --git a/regs/gdrom.ods b/regs/gdrom.ods index f6f6647..193d96a 100644 Binary files a/regs/gdrom.ods and b/regs/gdrom.ods differ