41c41
< * $FreeBSD: head/sys/dev/sound/pci/es137x.c 55204 1999-12-29 03:46:54Z cg $
---
> * $FreeBSD: head/sys/dev/sound/pci/es137x.c 55209 1999-12-29 05:44:17Z cg $
77c77
< typedef struct es_chinfo {
---
> struct es_chinfo {
83c83
< } es_chinfo_t;
---
> };
85c85
< typedef struct es_info {
---
> struct es_info {
95c95
< } es_info_t;
---
> };
104,110c104,108
< static u_int es1371_wait_src_ready(es_info_t *);
< static void es1371_src_write(es_info_t *, u_short, unsigned short);
< static u_int es1371_adc_rate(es_info_t *, u_int, int);
< static u_int es1371_dac_rate(es_info_t *, u_int, int);
< static int es1371_init(es_info_t *es);
< static int eschan1371_setspeed(void *data, u_int32_t speed);
<
---
> static u_int es1371_wait_src_ready(struct es_info *);
> static void es1371_src_write(struct es_info *, u_short, unsigned short);
> static u_int es1371_adc_rate(struct es_info *, u_int, int);
> static u_int es1371_dac_rate(struct es_info *, u_int, int);
> static int es1371_init(struct es_info *es, int);
118a117
> static int eschan1371_setspeed(void *data, u_int32_t speed);
467c466
< es1371_init(struct es_info *es)
---
> es1371_init(struct es_info *es, int rev)
477c476,483
< bus_space_write_4(es->st, es->sh, ES1370_REG_CONTROL, es->ctrl);
---
> if (rev == 7 || rev >= 9) {
> #define ES1371_BINTSUMM_OFF 0x07
> bus_space_write_4(es->st, es->sh, ES1371_BINTSUMM_OFF, 0x20);
> if (debug > 0) printf("es_init rev == 7 || rev >= 9\n");
> } else { /* pre ac97 2.1 card */
> bus_space_write_4(es->st, es->sh, ES1370_REG_CONTROL, es->ctrl);
> if (debug > 0) printf("es_init pre ac97 2.1\n");
> }
595c601
< es1371_src_read(es_info_t *es, u_short reg)
---
> es1371_src_read(struct es_info *es, u_short reg)
607c613
< es1371_src_write(es_info_t *es, u_short reg, u_short data){
---
> es1371_src_write(struct es_info *es, u_short reg, u_short data){
618c624
< es1371_adc_rate(es_info_t *es, u_int rate, int set)
---
> es1371_adc_rate(struct es_info *es, u_int rate, int set)
651c657
< es1371_dac_rate(es_info_t *es, u_int rate, int set)
---
> es1371_dac_rate(struct es_info *es, u_int rate, int set)
675c681
< es1371_wait_src_ready(es_info_t *es)
---
> es1371_wait_src_ready(struct es_info *es)
761c767
< if(-1 == es1371_init(es)) {
---
> if(-1 == es1371_init(es, pci_get_revid(dev))) {