Attachment #5966 for bug #13846

View | Details | Raw Unified | Return to bug 13846
Collapse All | Expand All

Lines 126-132 Link Here

(-)identcpu.c (-1 / +3 lines)
126	printcpuinfo(void)	126	printcpuinfo(void)
127	{	127	{
128		128
129	u_int regs[4], nreg;	129	u_int regs[4];
		130	u_int nreg = 0; /* Used iff strcmp(cpu_vendor,"AuthenticAMD") == 0 */
		131
130	cpu_class = i386_cpus[cpu].cpu_class;	132	cpu_class = i386_cpus[cpu].cpu_class;
131	printf("CPU: ");	133	printf("CPU: ");
132	strncpy(cpu_model, i386_cpus[cpu].cpu_name, sizeof cpu_model);	134	strncpy(cpu_model, i386_cpus[cpu].cpu_name, sizeof cpu_model);

Lines 592-598 Link Here

(-)clock.c (-1 / +1 lines)
592	static u_int	592	static u_int
593	calibrate_clocks(void)	593	calibrate_clocks(void)
594	{	594	{
595	u_int64_t old_tsc;	595	u_int64_t old_tsc = 0; /* used iff tsc_present */
596	u_int count, prev_count, tot_count;	596	u_int count, prev_count, tot_count;
597	int sec, start_sec, timeout;	597	int sec, start_sec, timeout;
598		598

Lines 122-129 Link Here

(-)npx.c (+2 lines)
122	static int npxattach __P((struct isa_device *dvp));	122	static int npxattach __P((struct isa_device *dvp));
123	static int npxprobe __P((struct isa_device *dvp));	123	static int npxprobe __P((struct isa_device *dvp));
124	static int npxprobe1 __P((struct isa_device *dvp));	124	static int npxprobe1 __P((struct isa_device *dvp));
		125	#ifdef I586_CPU
125	static long timezero __P((const char *funcname,	126	static long timezero __P((const char *funcname,
126	void (func)(void buf, size_t len)));	127	void (func)(void buf, size_t len)));
		128	#endif
127		129
128	struct isa_driver npxdriver = {	130	struct isa_driver npxdriver = {
129	npxprobe, npxattach, "npx",	131	npxprobe, npxattach, "npx",




    }
    dev->id_drq = d.drq[0] ; /* primary dma */
    dev->id_irq = (1 << d.irq[0] ) ;
    dev->id_ointr = pcmintr ;
    dev->id_flags = DV_F_DUAL_DMA | (d.drq[1] ) ;

    tmp_d.synth_base = d.port[1]; /* XXX check this for yamaha */

    }
    dev->id_drq = d.drq[0] ; /* primary dma */
    dev->id_irq = (1 << d.irq[0] ) ;
    dev->id_ointr = pcmintr ;
    pcmattach(dev);
}



    dev->id_drq = d.drq[0] ; /* primary dma */
    dev->id_irq = (1 << d.irq[0] ) ;
    dev->id_ointr = pcmintr ;
    dev->id_flags = DV_F_DUAL_DMA | d.drq[1] ;
    tmp_d.audio_fmt |= AFMT_FULLDUPLEX ;


    dev->id_iobase = d.port[2] - 4 ; /* room for 4 mss registers */
    dev->id_drq = d.drq[1] ; /* XXX PLAY dma */
    dev->id_irq = (1 << d.irq[0] ) ;
    dev->id_ointr = pcmintr ;
    dev->id_flags = DV_F_DUAL_DMA | d.drq[0]  ; /* REC dma */

    tmp_d.io_base = d.port[2] - 4;




#ifdef	__SGNXPRO__
mixer_tab       sgnxpro_mix;
#endif
static u_char sb16_recmasks_L[SOUND_MIXER_NRDEVICES];
static u_char sb16_recmasks_R[SOUND_MIXER_NRDEVICES];
#else /* __SB_MIXER_C__ defined */
mixer_tab       sbpro_mix = {
    PMIX_ENT(SOUND_MIXER_VOLUME,  0x22, 4, 4, 0x22, 0, 4),

	0x4b4b,			/* Input gain */
0x4b4b};			/* Output gain */
#endif				/* SM_GAMES */

static u_char sb16_recmasks_L[SOUND_MIXER_NRDEVICES] =
{
	0x00,			/* SOUND_MIXER_VOLUME	 */
	0x00,			/* SOUND_MIXER_BASS	 */
	0x00,			/* SOUND_MIXER_TREBLE	 */
	0x40,			/* SOUND_MIXER_SYNTH	 */
	0x00,			/* SOUND_MIXER_PCM	 */
	0x00,			/* SOUND_MIXER_SPEAKER	 */
	0x10,			/* SOUND_MIXER_LINE	 */
	0x01,			/* SOUND_MIXER_MIC	 */
	0x04,			/* SOUND_MIXER_CD	 */
	0x00,			/* SOUND_MIXER_IMIX	 */
	0x00,			/* SOUND_MIXER_ALTPCM	 */
	0x00,			/* SOUND_MIXER_RECLEV	 */
	0x00,			/* SOUND_MIXER_IGAIN	 */
	0x00			/* SOUND_MIXER_OGAIN	 */
};

static u_char sb16_recmasks_R[SOUND_MIXER_NRDEVICES] =
{
	0x00,			/* SOUND_MIXER_VOLUME	 */
	0x00,			/* SOUND_MIXER_BASS	 */
	0x00,			/* SOUND_MIXER_TREBLE	 */
	0x20,			/* SOUND_MIXER_SYNTH	 */
	0x00,			/* SOUND_MIXER_PCM	 */
	0x00,			/* SOUND_MIXER_SPEAKER	 */
	0x08,			/* SOUND_MIXER_LINE	 */
	0x01,			/* SOUND_MIXER_MIC	 */
	0x02,			/* SOUND_MIXER_CD	 */
	0x00,			/* SOUND_MIXER_IMIX	 */
	0x00,			/* SOUND_MIXER_ALTPCM	 */
	0x00,			/* SOUND_MIXER_RECLEV	 */
	0x00,			/* SOUND_MIXER_IGAIN	 */
	0x00			/* SOUND_MIXER_OGAIN	 */
};

/*
 * Recording sources (SB Pro)

Lines 190-196 Link Here

(-)kern_ntptime.c (-2 / +3 lines)
190	* End of phase/frequency-lock loop (PLL/FLL) definitions	190	* End of phase/frequency-lock loop (PLL/FLL) definitions
191	*/	191	*/
192		192
193	static void ntp_init(void);	193	static void ntp_init(void *);
194	static void hardupdate(long offset);	194	static void hardupdate(long offset);
195		195
196	/*	196	/*
Lines 505-511 Link Here
505	* probably be integrated with the code that does that.	505	* probably be integrated with the code that does that.
506	*/	506	*/
507	static void	507	static void
508	ntp_init()	508	ntp_init(void * p)
		509	/* ARGSUSED */
509	{	510	{
510		511
511	/*	512	/*





#include <pci/es1370_reg.h>
#include <i386/isa/snd/sound.h>
#define DSP_ULAW_NOT_WANTED
#include <i386/isa/snd/ulaw.h>

#if NPCI != 0

static void     es_rd_map(void *, bus_dma_segment_t *, int, int);
static int      es_wrabort(snddev_info *);
static void     es_wr_map(void *, bus_dma_segment_t *, int, int);
static const char *es_pci_probe __P((pcici_t, pcidi_t));
static void	es_pci_attach __P((pcici_t, int));
static int	es_rd_dmaupdate(snddev_info *);
static d_select_t es_select;

	return (0);
}

static const char *
es_pci_probe(pcici_t tag, pcidi_t type)
{
	if (type == ES1370_PCI_ID)

Lines 37-42 Link Here

(-)sysent.h (+1 lines)
37	#define _SYS_SYSENT_H_	37	#define _SYS_SYSENT_H_
38		38
39	struct proc;	39	struct proc;
		40	struct vnode;
40		41
41	typedef int sy_call_t __P((struct proc , void ));	42	typedef int sy_call_t __P((struct proc , void ));
42		43





u_char *	mfs_getimage __P((void));

#ifdef MFS_ROOT
static caddr_t	mfs_rootbase;	/* address of mini-root in kernel virtual memory */
static u_long	mfs_rootsize;	/* size of mini-root in bytes */
#endif

static	int mfs_minor;	/* used for building internal dev_t */


	struct mfs_args args;
	struct ufsmount *ump;
	struct fs *fs;
#ifdef MFS_ROOT
	u_char *base;
#endif
	struct mfsnode *mfsp;
	u_int size;
	int flags, err;

		goto error_2;
	}

#if MFS_ROOT
dostatfs:
#endif
	/*
	 * Initialize FS stat information in mount struct; uses both
	 * mp->mnt_stat.f_mntonname and mp->mnt_stat.f_mntfromname

Return to bug 13846

Lines 260-267 Link Here

(-)sbcard.h (-38 lines)
260	#ifdef __SGNXPRO__	260	#ifdef __SGNXPRO__
261	mixer_tab sgnxpro_mix;	261	mixer_tab sgnxpro_mix;
262	#endif	262	#endif
263	static u_char sb16_recmasks_L[SOUND_MIXER_NRDEVICES];
264	static u_char sb16_recmasks_R[SOUND_MIXER_NRDEVICES];
265	#else /* __SB_MIXER_C__ defined */	263	#else /* __SB_MIXER_C__ defined */
266	mixer_tab sbpro_mix = {	264	mixer_tab sbpro_mix = {
267	PMIX_ENT(SOUND_MIXER_VOLUME, 0x22, 4, 4, 0x22, 0, 4),	265	PMIX_ENT(SOUND_MIXER_VOLUME, 0x22, 4, 4, 0x22, 0, 4),
Lines 354-395 Link Here
354	0x4b4b, /* Input gain */	352	0x4b4b, /* Input gain */
355	0x4b4b}; /* Output gain */	353	0x4b4b}; /* Output gain */
356	#endif /* SM_GAMES */	354	#endif /* SM_GAMES */
357
358	static u_char sb16_recmasks_L[SOUND_MIXER_NRDEVICES] =
359	{
360	0x00, /* SOUND_MIXER_VOLUME */
361	0x00, /* SOUND_MIXER_BASS */
362	0x00, /* SOUND_MIXER_TREBLE */
363	0x40, /* SOUND_MIXER_SYNTH */
364	0x00, /* SOUND_MIXER_PCM */
365	0x00, /* SOUND_MIXER_SPEAKER */
366	0x10, /* SOUND_MIXER_LINE */
367	0x01, /* SOUND_MIXER_MIC */
368	0x04, /* SOUND_MIXER_CD */
369	0x00, /* SOUND_MIXER_IMIX */
370	0x00, /* SOUND_MIXER_ALTPCM */
371	0x00, /* SOUND_MIXER_RECLEV */
372	0x00, /* SOUND_MIXER_IGAIN */
373	0x00 /* SOUND_MIXER_OGAIN */
374	};
375
376	static u_char sb16_recmasks_R[SOUND_MIXER_NRDEVICES] =
377	{
378	0x00, /* SOUND_MIXER_VOLUME */
379	0x00, /* SOUND_MIXER_BASS */
380	0x00, /* SOUND_MIXER_TREBLE */
381	0x20, /* SOUND_MIXER_SYNTH */
382	0x00, /* SOUND_MIXER_PCM */
383	0x00, /* SOUND_MIXER_SPEAKER */
384	0x08, /* SOUND_MIXER_LINE */
385	0x01, /* SOUND_MIXER_MIC */
386	0x02, /* SOUND_MIXER_CD */
387	0x00, /* SOUND_MIXER_IMIX */
388	0x00, /* SOUND_MIXER_ALTPCM */
389	0x00, /* SOUND_MIXER_RECLEV */
390	0x00, /* SOUND_MIXER_IGAIN */
391	0x00 /* SOUND_MIXER_OGAIN */
392	};
393		355
394	/*	356	/*
395	* Recording sources (SB Pro)	357	* Recording sources (SB Pro)

Lines 64-71 Link Here

(-)mfs_vfsops.c (+6 lines)
64		64
65	u_char * mfs_getimage __P((void));	65	u_char * mfs_getimage __P((void));
66		66
		67	#ifdef MFS_ROOT
67	static caddr_t mfs_rootbase; /* address of mini-root in kernel virtual memory */	68	static caddr_t mfs_rootbase; /* address of mini-root in kernel virtual memory */
68	static u_long mfs_rootsize; /* size of mini-root in bytes */	69	static u_long mfs_rootsize; /* size of mini-root in bytes */
		70	#endif
69		71
70	static int mfs_minor; /* used for building internal dev_t */	72	static int mfs_minor; /* used for building internal dev_t */
71		73
Lines 178-184 Link Here
178	struct mfs_args args;	180	struct mfs_args args;
179	struct ufsmount *ump;	181	struct ufsmount *ump;
180	struct fs *fs;	182	struct fs *fs;
		183	#ifdef MFS_ROOT
181	u_char *base;	184	u_char *base;
		185	#endif
182	struct mfsnode *mfsp;	186	struct mfsnode *mfsp;
183	u_int size;	187	u_int size;
184	int flags, err;	188	int flags, err;
Lines 344-350 Link Here
344	goto error_2;	348	goto error_2;
345	}	349	}
346		350
		351	#if MFS_ROOT
347	dostatfs:	352	dostatfs:
		353	#endif
348	/*	354	/*
349	* Initialize FS stat information in mount struct; uses both	355	* Initialize FS stat information in mount struct; uses both
350	* mp->mnt_stat.f_mntonname and mp->mnt_stat.f_mntfromname	356	* mp->mnt_stat.f_mntonname and mp->mnt_stat.f_mntfromname

Lines 1584-1590 Link Here

(-)ad1848.c (-4 / +4 lines)
1584	}	1584	}
1585	dev->id_drq = d.drq[0] ; /* primary dma */	1585	dev->id_drq = d.drq[0] ; /* primary dma */
1586	dev->id_irq = (1 << d.irq[0] ) ;	1586	dev->id_irq = (1 << d.irq[0] ) ;
1587	dev->id_intr = pcmintr ;	1587	dev->id_ointr = pcmintr ;
1588	dev->id_flags = DV_F_DUAL_DMA \| (d.drq[1] ) ;	1588	dev->id_flags = DV_F_DUAL_DMA \| (d.drq[1] ) ;
1589		1589
1590	tmp_d.synth_base = d.port[1]; /* XXX check this for yamaha */	1590	tmp_d.synth_base = d.port[1]; /* XXX check this for yamaha */
Lines 1687-1693 Link Here
1687	}	1687	}
1688	dev->id_drq = d.drq[0] ; /* primary dma */	1688	dev->id_drq = d.drq[0] ; /* primary dma */
1689	dev->id_irq = (1 << d.irq[0] ) ;	1689	dev->id_irq = (1 << d.irq[0] ) ;
1690	dev->id_intr = pcmintr ;	1690	dev->id_ointr = pcmintr ;
1691	pcmattach(dev);	1691	pcmattach(dev);
1692	}	1692	}
1693		1693
Lines 1752-1758 Link Here
1752		1752
1753	dev->id_drq = d.drq[0] ; /* primary dma */	1753	dev->id_drq = d.drq[0] ; /* primary dma */
1754	dev->id_irq = (1 << d.irq[0] ) ;	1754	dev->id_irq = (1 << d.irq[0] ) ;
1755	dev->id_intr = pcmintr ;	1755	dev->id_ointr = pcmintr ;
1756	dev->id_flags = DV_F_DUAL_DMA \| d.drq[1] ;	1756	dev->id_flags = DV_F_DUAL_DMA \| d.drq[1] ;
1757	tmp_d.audio_fmt \|= AFMT_FULLDUPLEX ;	1757	tmp_d.audio_fmt \|= AFMT_FULLDUPLEX ;
1758		1758
Lines 1815-1821 Link Here
1815	dev->id_iobase = d.port[2] - 4 ; /* room for 4 mss registers */	1815	dev->id_iobase = d.port[2] - 4 ; /* room for 4 mss registers */
1816	dev->id_drq = d.drq[1] ; /* XXX PLAY dma */	1816	dev->id_drq = d.drq[1] ; /* XXX PLAY dma */
1817	dev->id_irq = (1 << d.irq[0] ) ;	1817	dev->id_irq = (1 << d.irq[0] ) ;
1818	dev->id_intr = pcmintr ;	1818	dev->id_ointr = pcmintr ;
1819	dev->id_flags = DV_F_DUAL_DMA \| d.drq[0] ; /* REC dma */	1819	dev->id_flags = DV_F_DUAL_DMA \| d.drq[0] ; /* REC dma */
1820		1820
1821	tmp_d.io_base = d.port[2] - 4;	1821	tmp_d.io_base = d.port[2] - 4;

Lines 53-58 Link Here

(-)es1370.c (-2 / +3 lines)
53		53
54	#include <pci/es1370_reg.h>	54	#include <pci/es1370_reg.h>
55	#include <i386/isa/snd/sound.h>	55	#include <i386/isa/snd/sound.h>
		56	#define DSP_ULAW_NOT_WANTED
56	#include <i386/isa/snd/ulaw.h>	57	#include <i386/isa/snd/ulaw.h>
57		58
58	#if NPCI != 0	59	#if NPCI != 0
Lines 130-136 Link Here
130	static void es_rd_map(void , bus_dma_segment_t , int, int);	131	static void es_rd_map(void , bus_dma_segment_t , int, int);
131	static int es_wrabort(snddev_info *);	132	static int es_wrabort(snddev_info *);
132	static void es_wr_map(void , bus_dma_segment_t , int, int);	133	static void es_wr_map(void , bus_dma_segment_t , int, int);
133	static char *es_pci_probe __P((pcici_t, pcidi_t));	134	static const char *es_pci_probe __P((pcici_t, pcidi_t));
134	static void es_pci_attach __P((pcici_t, int));	135	static void es_pci_attach __P((pcici_t, int));
135	static int es_rd_dmaupdate(snddev_info *);	136	static int es_rd_dmaupdate(snddev_info *);
136	static d_select_t es_select;	137	static d_select_t es_select;
Lines 1021-1027 Link Here
1021	return (0);	1022	return (0);
1022	}	1023	}
1023		1024
1024	static char *	1025	static const char *
1025	es_pci_probe(pcici_t tag, pcidi_t type)	1026	es_pci_probe(pcici_t tag, pcidi_t type)
1026	{	1027	{
1027	if (type == ES1370_PCI_ID)	1028	if (type == ES1370_PCI_ID)