diff options
| author |   Joseph Jezak <josejx@gentoo.org> | 2006-01-04 17:14:32 +0000 |
|---|---|---|
| committer | Joseph Jezak <josejx@gentoo.org> | 2006-01-04 17:14:32 +0000 |
| commit | d5490eeb99bffd1291e9c04cf18e558413030c4c (patch) | |
| tree | 792002bc1c882b368fc4c862a68c11db37ae55b8 /app-emulation/mol | |
| parent | version bump (diff) | |
| download | gentoo-2-d5490eeb99bffd1291e9c04cf18e558413030c4c.tar.gz gentoo-2-d5490eeb99bffd1291e9c04cf18e558413030c4c.tar.bz2 gentoo-2-d5490eeb99bffd1291e9c04cf18e558413030c4c.zip | |
Fixed pciproxy debug patch
(Portage version: 2.0.54)
Diffstat (limited to 'app-emulation/mol')
| -rw-r--r-- | app-emulation/mol/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emulation/mol/files/mol-pciproxy-dump.patch | 18 |
2 files changed, 10 insertions, 16 deletions
diff --git a/app-emulation/mol/ChangeLog b/app-emulation/mol/ChangeLog index e7dec6d216ee..9c8c84a41a96 100644 --- a/app-emulation/mol/ChangeLog +++ b/app-emulation/mol/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/mol -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.56 2005/12/31 22:41:12 josejx Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.57 2006/01/04 17:14:32 josejx Exp $ + + 04 Jan 2006; Joseph Jezak <josejx@gentoo.org> + files/mol-pciproxy-dump.patch: + Fixed pciproxy debug patch. 31 Dec 2005; Joseph Jezak <josejx@gentoo.org> -mol-0.9.71_pre2.ebuild, -mol-0.9.71_pre3.ebuild, -mol-0.9.71_pre5.ebuild, mol-0.9.71_pre6.ebuild: diff --git a/app-emulation/mol/files/mol-pciproxy-dump.patch b/app-emulation/mol/files/mol-pciproxy-dump.patch index ab96dc13cdc4..f321a6b9abe5 100644 --- a/app-emulation/mol/files/mol-pciproxy-dump.patch +++ b/app-emulation/mol/files/mol-pciproxy-dump.patch @@ -233,7 +233,7 @@ driver_interface_t pciproxy_driver = --- src/drivers/plain-dump.c 1970-01-01 01:00:00.000000000 +0100 +++ src/drivers/plain-dump.c 2005-07-20 21:58:39.656827024 +0200 -@@ -0,0 +1,42 @@ +@@ -0,0 +1,43 @@ +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> @@ -244,6 +244,7 @@ +#include <sys/time.h> +#include <time.h> +#include <string.h> ++#include "molcpu.h" +#include "plain-dump.h" + +static int pdump_fd = -1; @@ -259,8 +260,8 @@ + if (gettimeofday(&t, NULL)) + fprintf(stderr, "gettimeofday error\n"); + -+ len = snprintf(buf, sizeof(buf), "%.8ld.%.6ld %s %s 0x%.4x %d %*dx%.*x\n", -+ t.tv_sec, t.tv_usec, type, (in?"r":"w"), offset, datalen, 9-2*datalen, 0, 2*datalen, data); ++ len = snprintf(buf, sizeof(buf), "%.8ld.%.6ld 0x%.8x %s %s 0x%.4x %d %*dx%.*x\n", ++ t.tv_sec, t.tv_usec, mregs->nip, type, (in?"r":"w"), offset, datalen, 9-2*datalen, 0, 2*datalen, data); + + if (len > 0) + write(pdump_fd, buf, len); @@ -297,17 +298,6 @@ #ifdef LINUX_26 #include <asm/cacheflush.h> ---- src/netdriver/Makefile.26 2005-07-21 14:26:25.014345820 +0200 -+++ src/netdriver/Makefile.26 2005-07-20 11:20:48.898880688 +0200 -@@ -6,7 +6,7 @@ - obj-m += kuname.o - - --$(obj)/sheep.o $(obj)/ethertap.o $(obj)tun.o: $(src)/.kuname -+$(obj)/sheep.o $(obj)/ethertap.o $(obj)/tun.o: $(src)/.kuname - - $(src)/.kuname: $(obj)/kuname.o - strings $< | grep -- '-MAGIC-' | sed -e s/-MAGIC-// > $@ --- util/ofdump/Makefile 2005-07-21 14:26:25.188359502 +0200 +++ util/ofdump/Makefile 2005-07-20 11:20:48.921882497 +0200 @@ -12,9 +12,9 @@ |