From DoBi-tyndur at gmx.net Sun Mar 4 12:05:00 2012 From: DoBi-tyndur at gmx.net (Dominik Bittner) Date: Sun, 4 Mar 2012 12:05:00 +0100 Subject: [tyndur-devel] =?utf8?q?=5BPATCH=5D_Unn=C3=B6tige_Berechnung_des_?= =?utf8?q?Restes_verschoben=2E?= Message-ID: <1330859100-4705-1-git-send-email-DoBi-tyndur@gmx.net> Signed-off-by: Dominik Bittner --- src/modules/lib/stdlibc/jprintf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/modules/lib/stdlibc/jprintf.c b/src/modules/lib/stdlibc/jprintf.c index fb5c568..cefd586 100644 --- a/src/modules/lib/stdlibc/jprintf.c +++ b/src/modules/lib/stdlibc/jprintf.c @@ -52,10 +52,10 @@ unsigned long long divmod(unsigned long long dividend, unsigned int divisor, uns unsigned int rem; quotient = dividend / divisor; - rem = dividend % divisor; if(remainder) { + rem = dividend % divisor; *remainder = rem; } -- 1.7.2.5 From kevin at tyndur.org Mon Mar 5 22:41:30 2012 From: kevin at tyndur.org (Kevin Wolf) Date: Mon, 5 Mar 2012 22:41:30 +0100 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH=5D_Unn=F6tige_Berechnung_d?= =?iso-8859-1?q?es_Restes_verschoben=2E?= In-Reply-To: <1330859100-4705-1-git-send-email-DoBi-tyndur@gmx.net> References: <1330859100-4705-1-git-send-email-DoBi-tyndur@gmx.net> Message-ID: <20120305214130.GA30771@silvanus> On Sun, Mar 04, 2012 at 12:05:00PM +0100, Dominik Bittner wrote: > Signed-off-by: Dominik Bittner > --- > src/modules/lib/stdlibc/jprintf.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Danke, ist drin. Der Binärcode, der am Ende rauskommt, ist natürlich der gleiche (ich hab das spaßeshalber sogar nachgeprüft), aber es sieht so vielleicht ein bisschen ordentlicher aus. Kevin From alex at tyndur.org Wed Mar 14 15:13:05 2012 From: alex at tyndur.org (Alexander Siol) Date: Wed, 14 Mar 2012 15:13:05 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_1/2=5D_!_config=2Epy=3A_Fix_f?= =?utf-8?q?=C3=BCr_Python_3=2Ex?= Message-ID: <1331734386-19906-1-git-send-email-alex@tyndur.org> From: Alexander Signed-off-by: Alexander Siol --- config.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config.py b/config.py index f3748d6..9c7f369 100755 --- a/config.py +++ b/config.py @@ -7,8 +7,8 @@ frontend = "dialog" result = os.popen('which ' + frontend) if result.read() == '': - print "\nDas gewuenschte Frontend (" + frontend + ") steht nicht zur Verfuegung." - print "Sie muessen ein anderes waehlen (editieren sie config.py), oder das gewaehlte installieren.\n" + print("\nDas gewuenschte Frontend (" + frontend + ") steht nicht zur Verfuegung.") + print("Sie muessen ein anderes waehlen (editieren sie config.py), oder das gewaehlte installieren.\n") sys.exit(1) @@ -34,7 +34,7 @@ class shift_register: def show_dialog(options, define_name, define_value): title = "tyndur Konfigurieren" - print define_value + print(define_value) if options['type'] == 'yesno': if define_value == "undef": @@ -70,7 +70,7 @@ def show_dialog(options, define_name, define_value): line_buffer = shift_register(10) -config_file_source = open('src/include/lost/config.h','rw') +config_file_source = open('src/include/lost/config.h','r') lines = config_file_source.readlines() config_file_dest = open('src/include/lost/config.h','w') @@ -100,7 +100,7 @@ for _line in lines: if(match_define_complex): define_name = match_define_complex.group(1) define_value = match_define_complex.group(2) - print 'define name:`' + define_name + '` value:`' + match_define_complex.group(2) + '`' + print('define name:`' + define_name + '` value:`' + match_define_complex.group(2) + '`') _line = _line.replace(line, show_dialog(options, define_name, define_value)) else: @@ -109,7 +109,7 @@ for _line in lines: is_defined = match_define_simple.group(1) define_name = match_define_simple.group(2) - print 'define name:`' + define_name + '` value:`' + is_defined + '`' + print('define name:`' + define_name + '` value:`' + is_defined + '`') _line = _line.replace(line, show_dialog(options, define_name, is_defined)) @@ -120,5 +120,5 @@ for _line in lines: config_file_dest.close() config_file_source.close() -print "\n\nAls naechster Schritt ist in den meisten Faellen ein 'make clean' notwendig." -print "Anschliessend koennen mit 'make' der tyndur-Kernel und die Module erstellt werden.\n\n" +print("\n\nAls naechster Schritt ist in den meisten Faellen ein 'make clean' notwendig.") +print("Anschliessend koennen mit 'make' der tyndur-Kernel und die Module erstellt werden.\n\n") -- 1.7.9.3 From alex at tyndur.org Wed Mar 14 15:13:06 2012 From: alex at tyndur.org (Alexander Siol) Date: Wed, 14 Mar 2012 15:13:06 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_2/2=5D_!_make_image-hd=3A_Skrip?= =?utf-8?q?te_f=C3=BCr_Python_3=2Ex_angepasst?= In-Reply-To: <1331734386-19906-1-git-send-email-alex@tyndur.org> References: <1331734386-19906-1-git-send-email-alex@tyndur.org> Message-ID: <1331734386-19906-2-git-send-email-alex@tyndur.org> From: Alexander Signed-off-by: Alexander Siol --- build/scripts/create_partition | 15 ++++++++------- build/scripts/get_partition | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build/scripts/create_partition b/build/scripts/create_partition index feb5574..c0181bc 100755 --- a/build/scripts/create_partition +++ b/build/scripts/create_partition @@ -46,26 +46,27 @@ head_count = 16 # Partitionstabelleneintraege. def lba2chs(lba): # CHS Berechnen - cylinder = lba / (sectors_per_track * head_count) + cylinder = int(lba // (sectors_per_track * head_count)) temp = lba % (head_count * sectors_per_track) - head = temp / sectors_per_track; + head = temp // sectors_per_track; sector = (temp % sectors_per_track) + 1; # Fuer Partitionstabelle Formatieren - a = head - b = ((cylinder & 0x300) >> 2) + sector - c = cylinder & 0xFF + a = int(head) + b = int(((cylinder & 0x300) >> 2) + sector) + c = int(cylinder & 0xFF) return a, b, c # DWORD in 4 Bytes umrechenen (Little Endian) # Zurueckgegeben wird ein Tupel mit den Bytes def le_dword(dword): + dword = int(dword) return (dword >> 0) & 255, (dword >> 8) & 255, (dword >> 16) & 255, (dword >> 24) & 255 # Abrrechen wenn kein Argument mit dem Pfad gefunden werden konnte if len(sys.argv) <= 1: - print 'Bitte Imagepfad angeben' + print('Bitte Imagepfad angeben') sys.exit(-1) # Ansonsten wird der Pfad gespeichert @@ -74,7 +75,7 @@ image_path = sys.argv[1] # Image oeffnen image_file = open(image_path, mode='r+b') if image_file == 0: - print 'Image konnte nicht geoeffnet werden.' + print('Image konnte nicht geoeffnet werden.') sys.exit(-1) stat_info = os.lstat(image_path) image_size = stat_info[stat.ST_SIZE] diff --git a/build/scripts/get_partition b/build/scripts/get_partition index 0f89086..669c55c 100755 --- a/build/scripts/get_partition +++ b/build/scripts/get_partition @@ -44,7 +44,7 @@ def le_dword(a, b, c, d): # Abrrechen wenn kein Argument mit dem Pfad gefunden werden konnte if len(sys.argv) <= 1: - print 'Bitte Imagepfad angeben' + print('Bitte Imagepfad angeben') sys.exit(-1) # Ansonsten wird der Pfad gespeichert @@ -53,7 +53,7 @@ image_path = sys.argv[1] # Image oeffnen image_file = open(image_path, mode='rb') if image_file == 0: - print 'Image konnte nicht geoeffnet werden.' + print('Image konnte nicht geoeffnet werden.') sys.exit(-1) # Partitionstabelle vorbereiten und einlesen @@ -62,7 +62,7 @@ image_file.seek(446) part_table.fromfile(image_file, 63) # Werte anzeigen -print le_dword(part_table[8], part_table[9], part_table[10], part_table[11]), le_dword(part_table[12], part_table[13], part_table[14], part_table[15]) +print(str(le_dword(part_table[8], part_table[9], part_table[10], part_table[11])) + " " + str(le_dword(part_table[12], part_table[13], part_table[14], part_table[15]))) image_file.close() -- 1.7.9.3