From owner-freebsd-current Sun Apr 2 16: 5:48 2000 Delivered-To: freebsd-current@freebsd.org Received: from mail.snickers.org (mail.snickers.org [216.126.90.4]) by hub.freebsd.org (Postfix) with ESMTP id AA83F37BC03 for ; Sun, 2 Apr 2000 16:05:45 -0700 (PDT) (envelope-from josh@snickers.org) Received: by mail.snickers.org (Postfix, from userid 1037) id 37C713D24; Sun, 2 Apr 2000 19:04:42 -0400 (EDT) Date: Sun, 2 Apr 2000 19:04:42 -0400 From: Josh Tiefenbach To: current@freebsd.org Subject: kernel build busted in /sys/dev/sound/pci/emu10k1.c (fix included) Message-ID: <20000402190441.A70904@snickers.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="AhhlLboLdkugWU4S" X-Mailer: Mutt 1.0pre2i Organization: Hah Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG --AhhlLboLdkugWU4S Content-Type: text/plain; charset=us-ascii In attempting to test out Cameron's emu10k1 support, one quickly notices that the build dies in $SUBJECT due to unresolved constants. The attached patch fixes the problem. I'm happy to report that mpg123 is playing mp3's quite fine. There's a little burst of static when it first starts up, but other than that, things look fine for me. josh -- Give me rampant intellectualism as a coping strategy! -- Chuck Palahniuk in Invisible Monsters --AhhlLboLdkugWU4S Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="emu.patch" --- emu10k1.h Sun Apr 2 03:41:17 2000 +++ /tmp/emu10k1.h Sun Apr 2 19:01:32 2000 @@ -663,4 +663,12 @@ #define HIWORD_RESULT_MASK 0x000ffc00 /* Instruction result */ #define HIWORD_OPA_MASK 0x000003ff /* Instruction operand A */ +/* Following constants lifted from Creative's hwaccess.h file */ +/* Needed to get emu10k1.c rev 1.1 to compile */ +#define ENABLE 0xffffffff +#define DISABLE 0x00000000 + +#define ENV_ON 0x80 +#define ENV_OFF 0x00 + #endif /* _8010_H */ --AhhlLboLdkugWU4S-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message