Changeset 5287502 in mainline

Timestamp:

2011-03-21T16:01:58Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

34eb135, 434ef65

Parents:

28eee11c (diff), 432f68a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Files:

• kernel/tools/genmap.py (modified) (1 diff)
• tools/mkfat.py (modified) (3 diffs)
• tools/mkhord.py (modified) (1 diff)
• tools/mktmpfs.py (modified) (3 diffs)
• uspace/app/bdsh/cmds/modules/bdd/bdd.c (modified) (4 diffs)

kernel/tools/genmap.py

@@ -100 +100 @@
                         for addr, symbol in symbols:
                                 value = fname + ':' + symbol
-                                data = struct.pack(symtabfmt, addr + offset, value[:MAXSTRING])
+                                value_bytes = value.encode('ascii')
+                                data = struct.pack(symtabfmt, addr + offset, value_bytes[:MAXSTRING])
                                 out.write(data)
                         
-        out.write(struct.pack(symtabfmt, 0, ''))
+        out.write(struct.pack(symtabfmt, 0, b''))
 
 def main():

tools/mkfat.py

@@ -211 +211 @@
         dir_entry = xstruct.create(DIR_ENTRY)
         
-        dir_entry.name = mangle_fname(name)
-        dir_entry.ext = mangle_ext(name)
+        dir_entry.name = mangle_fname(name).encode('ascii')
+        dir_entry.ext = mangle_ext(name).encode('ascii')
         
         if (directory):
@@ -239 +239 @@
         
         dir_entry.signature = 0x2e
-        dir_entry.name = '       '
-        dir_entry.ext = '   '
+        dir_entry.name = b'       '
+        dir_entry.ext = b'   '
         dir_entry.attr = 0x10
         
@@ -258 +258 @@
         
         dir_entry.signature = [0x2e, 0x2e]
-        dir_entry.name = '      '
-        dir_entry.ext = '   '
+        dir_entry.name = b'      '
+        dir_entry.ext = b'   '
         dir_entry.attr = 0x10
         

tools/mkhord.py

@@ -84 +84 @@
         payload_size_aligned = align_up(payload_size, align)
         
-        header.tag = "HORD"
+        header.tag = b"HORD"
         header.version = 1
         header.encoding = HORD_LSB

tools/mktmpfs.py

@@ -80 +80 @@
                         dentry.kind = TMPFS_FILE
                         dentry.fname_len = len(name)
-                        dentry.fname = name
+                        dentry.fname = name.encode('ascii')
                         dentry.flen = size
                         
@@ -97 +97 @@
                         dentry.kind = TMPFS_DIRECTORY
                         dentry.fname_len = len(name)
-                        dentry.fname = name
+                        dentry.fname = name.encode('ascii')
                         
                         outf.write(dentry.pack())
@@ -122 +122 @@
         
         header = xstruct.create(HEADER)
-        header.tag = "TMPFS"
+        header.tag = b"TMPFS"
         
         outf.write(header.pack())

uspace/app/bdsh/cmds/modules/bdd/bdd.c

@@ -70 +70 @@
         unsigned int i, j;
         devmap_handle_t handle;
+        aoff64_t offset;
         uint8_t *blk;
         size_t size, bytes, rows;
@@ -120 +121 @@
         }
 
+        offset = ba * block_size;
+
         while (size > 0) {
                 rc = block_read_direct(handle, ba, 1, blk);
@@ -133 +136 @@
 
                 for (j = 0; j < rows; j++) {
+                        printf("[%06" PRIxOFF64 "] ", offset);
                         for (i = 0; i < BPR; i++) {
                                 if (j * BPR + i < bytes)
@@ -152 +156 @@
                                 }
                         }
+                        offset += BPR;
                         putchar('\n');
                 }