[Qemu-devel] qemu/hw pcnet.c

[Qemu-devel] qemu/hw pcnet.c

[Thiemo Seufer]

CVSROOT:	/sources/qemu
Module name:	qemu
Changes by:	Thiemo Seufer <ths>	07/03/06 18:56:13

Modified files:
	hw             : pcnet.c 

Log message:
	Fix unportable bitfields use which broke pcnet for big endian hosts.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pcnet.c?cvsroot=qemu&r1=1.8&r2=1.9

[Qemu-devel] qemu/hw pcnet.c

[Thiemo Seufer]

CVSROOT:	/sources/qemu
Module name:	qemu
Changes by:	Thiemo Seufer <ths>	07/08/18 13:08:30

Modified files:
	hw             : pcnet.c 

Log message:
	Remove obsolete comment.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pcnet.c?cvsroot=qemu&r1=1.16&r2=1.17

[Qemu-devel] qemu/hw pcnet.c

[Blue Swirl]

CVSROOT:	/cvsroot/qemu
Module name:	qemu
Changes by:	Blue Swirl <blueswir1>	07/06/28 15:28:18

Modified files:
	hw             : pcnet.c 

Log message:
	 Fix Lance on 32-bit hosts

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pcnet.c?cvsroot=qemu&r1=1.14&r2=1.15

[Qemu-devel] qemu/hw pcnet.c

[Fabrice Bellard]

CVSROOT:	/sources/qemu
Module name:	qemu
Changes by:	Fabrice Bellard <bellard>	06/09/03 16:40:12

Modified files:
	hw             : pcnet.c 

Log message:
	endianness fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pcnet.c?cvsroot=qemu&r1=1.5&r2=1.6

[Qemu-devel] qemu/hw pcnet.c

[Fabrice Bellard]

CVSROOT:	/sources/qemu
Module name:	qemu
Changes by:	Fabrice Bellard <bellard>	06/07/14 09:40:02

Modified files:
	hw             : pcnet.c 

Log message:
	win32 compilation fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pcnet.c?cvsroot=qemu&r1=1.3&r2=1.4

[Qemu-devel] qemu/hw pcnet.c

[Fabrice Bellard]

CVSROOT:	/sources/qemu
Module name:	qemu
Changes by:	Fabrice Bellard <bellard>	06/07/13 23:25:11

Modified files:
	hw             : pcnet.c 

Log message:
	avoid recursive tx

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pcnet.c?cvsroot=qemu&r1=1.2&r2=1.3

RE: [Qemu-devel] qemu/hw pcnet.c

[ZIGLIO, Frediano, VF-IT]

[-- Attachment #1: Type: text/plain, Size: 691 bytes --]

> 
> that fixed the mingw/win32 build
> thx
> 
> On 7/4/06, Fabrice Bellard <fabrice@bellard.org> wrote:
> > CVSROOT:        /sources/qemu
> > Module name:    qemu
> > Changes by:     Fabrice Bellard <bellard>       06/07/04 21:42:10
> >
> > Modified files:
> >        hw             : pcnet.c
> >
> > Log message:
> >        avoid unneeded dependencies
> >
> > CVSWeb URLs:
> > 
> http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pcnet.c?cvsroot=qe
mu&r1=1.1&r2=1.2
> >

Please consider also this patch. This fix compile using mingw/linux.
mingw/linux do not provide bcmp so I replace it with memcmp, also I
removed a small warning undefining a definition.

freddy77


[-- Attachment #2: pcnet.diff --]
[-- Type: application/octet-stream, Size: 2213 bytes --]

Index: hw/pcnet.c
===================================================================
RCS file: /sources/qemu/qemu/hw/pcnet.c,v
retrieving revision 1.2
diff -u -1 -0 -r1.2 pcnet.c
--- hw/pcnet.c	4 Jul 2006 21:42:10 -0000	1.2
+++ hw/pcnet.c	5 Jul 2006 07:16:22 -0000
@@ -53,20 +53,21 @@
     target_phys_addr_t rdra, tdra;
     uint8_t prom[16];
     uint16_t csr[128];
     uint16_t bcr[32];
     uint64_t timer;
     int xmit_pos, recv_pos;
     uint8_t buffer[4096];
 };
 
 #ifdef __GNUC__
+#undef PACKED
 #define PACKED(A) A __attribute__ ((packed))
 #else
 #error FixMe
 #endif
 
 struct qemu_ether_header {
     uint8_t ether_dhost[6];
     uint8_t ether_shost[6];
     uint16_t ether_type;
 };
@@ -547,37 +548,37 @@
 };
 
 static inline int padr_match(PCNetState *s, const uint8_t *buf, int size)
 {
     struct qemu_ether_header *hdr = (void *)buf;
     uint8_t padr[6] = { 
         s->csr[12] & 0xff, s->csr[12] >> 8,
         s->csr[13] & 0xff, s->csr[13] >> 8,
         s->csr[14] & 0xff, s->csr[14] >> 8 
     };
-    int result = (!CSR_DRCVPA(s)) && !bcmp(hdr->ether_dhost, padr, 6);
+    int result = (!CSR_DRCVPA(s)) && !memcmp(hdr->ether_dhost, padr, 6);
 #ifdef PCNET_DEBUG_MATCH
     printf("packet dhost=%02x:%02x:%02x:%02x:%02x:%02x, "
            "padr=%02x:%02x:%02x:%02x:%02x:%02x\n",
            hdr->ether_dhost[0],hdr->ether_dhost[1],hdr->ether_dhost[2],
            hdr->ether_dhost[3],hdr->ether_dhost[4],hdr->ether_dhost[5],
            padr[0],padr[1],padr[2],padr[3],padr[4],padr[5]);
     printf("padr_match result=%d\n", result);
 #endif
     return result;
 }
 
 static inline int padr_bcast(PCNetState *s, const uint8_t *buf, int size)
 {
     static uint8_t BCAST[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
     struct qemu_ether_header *hdr = (void *)buf;
-    int result = !CSR_DRCVBC(s) && !bcmp(hdr->ether_dhost, BCAST, 6);
+    int result = !CSR_DRCVBC(s) && !memcmp(hdr->ether_dhost, BCAST, 6);
 #ifdef PCNET_DEBUG_MATCH
     printf("padr_bcast result=%d\n", result);
 #endif
     return result;
 }
 
 static inline int ladr_match(PCNetState *s, const uint8_t *buf, int size)
 {
     struct qemu_ether_header *hdr = (void *)buf;
     if ((*(hdr->ether_dhost)&0x01) && 

[Qemu-devel] qemu/hw pcnet.c

[Fabrice Bellard]

CVSROOT:	/sources/qemu
Module name:	qemu
Changes by:	Fabrice Bellard <bellard>	06/07/04 21:42:10

Modified files:
	hw             : pcnet.c 

Log message:
	avoid unneeded dependencies

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pcnet.c?cvsroot=qemu&r1=1.1&r2=1.2

Re: [Qemu-devel] qemu/hw pcnet.c

[Christian MICHON]

that fixed the mingw/win32 build
thx

On 7/4/06, Fabrice Bellard <fabrice@bellard.org> wrote:
> CVSROOT:        /sources/qemu
> Module name:    qemu
> Changes by:     Fabrice Bellard <bellard>       06/07/04 21:42:10
>
> Modified files:
>        hw             : pcnet.c
>
> Log message:
>        avoid unneeded dependencies
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pcnet.c?cvsroot=qemu&r1=1.1&r2=1.2
>
>
> _______________________________________________
> Qemu-devel mailing list
> Qemu-devel@nongnu.org
> http://lists.nongnu.org/mailman/listinfo/qemu-devel
>


-- 
Christian