Attachment #13179 for bug #25201

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

Lines 44-50 Link Here

(-)sys/pc98/pc98/sc_machdep.h (-1 / +1 lines)
44		44
45	#define KANJI 1	45	#define KANJI 1
46		46
47	#define BELL_DURATION 5	47	#define BELL_DURATION ((5 * hz + 99) / 100)
48	#define BELL_PITCH_8M 1339	48	#define BELL_PITCH_8M 1339
49	#define BELL_PITCH_5M 1678	49	#define BELL_PITCH_5M 1678
50		50

Lines 628-634 Link Here

(-)sys/pc98/pc98/scterm-sck.c (-1 / +1 lines)
628	case 'B': /* set bell pitch and duration */	628	case 'B': /* set bell pitch and duration */
629	if (tcp->num_param == 2) {	629	if (tcp->num_param == 2) {
630	scp->bell_pitch = tcp->param[0];	630	scp->bell_pitch = tcp->param[0];
631	scp->bell_duration = tcp->param[1];	631	scp->bell_duration = (tcp->param[1] * hz + 99) / 100;
632	}	632	}
633	break;	633	break;
634		634

Lines 545-551 Link Here

(-)sys/dev/syscons/scterm-sc.c (-1 / +1 lines)
545	case 'B': /* set bell pitch and duration */	545	case 'B': /* set bell pitch and duration */
546	if (tcp->num_param == 2) {	546	if (tcp->num_param == 2) {
547	scp->bell_pitch = tcp->param[0];	547	scp->bell_pitch = tcp->param[0];
548	scp->bell_duration = tcp->param[1];	548	scp->bell_duration = (tcp->param[1] * hz + 99) / 100;
549	}	549	}
550	break;	550	break;
551		551

Lines 120-126 Link Here

(-)sys/dev/syscons/syscons.h (-1 / +1 lines)
120	#define PCBURST 128	120	#define PCBURST 128
121		121
122	#ifndef BELL_DURATION	122	#ifndef BELL_DURATION
123	#define BELL_DURATION 5	123	#define BELL_DURATION ((5 * hz + 99) / 100)
124	#define BELL_PITCH 800	124	#define BELL_PITCH 800
125	#endif	125	#endif
126		126

Lines 1342-1349 Link Here

(-)sys/i386/isa/pcvt/pcvt_kbd.c (-2 / +2 lines)
1342	* pulates the spl mask - jw	1342	* pulates the spl mask - jw
1343	*/	1343	*/
1344		1344
1345	# define PLING sysbeep(PCVT_SYSBEEPF / 1500, 2)	1345	# define PLING sysbeep(PCVT_SYSBEEPF / 1500, (2 * hz + 99) / 100)
1346	# define PLONG sysbeep(PCVT_SYSBEEPF / 1200, 2)	1346	# define PLONG sysbeep(PCVT_SYSBEEPF / 1200, (2 * hz + 99) / 100)
1347		1347
1348	if(mousedef.stickybuttons)	1348	if(mousedef.stickybuttons)
1349	{	1349	{




	melody = (struct tone *)arg;

	if (melody->pitch != NULL) {
		sysbeep(melody->pitch, (melody->duration * hz + 99) / 100);
		timeout(pccard_beep_sub, ++melody, (melody->duration * hz + 99) / 100);
	} else 
		allow_beep = BEEP_ON;
}


	if (allow_beep == BEEP_ON && melody->pitch != NULL) {
		allow_beep = BEEP_OFF;
		sysbeep(melody->pitch, (melody->duration * hz + 99) / 100);
		timeout(pccard_beep_sub, ++melody, (melody->duration * hz + 99) / 100);
	}
}

---

Return to bug 25201

Lines 74-81 Link Here

(-)sys/pccard/pccard_beep.c (-5 / +4 lines)
74	melody = (struct tone *)arg;	74	melody = (struct tone *)arg;
75		75
76	if (melody->pitch != NULL) {	76	if (melody->pitch != NULL) {
77	sysbeep(melody->pitch, melody->duration);	77	sysbeep(melody->pitch, (melody->duration * hz + 99) / 100);
78	timeout(pccard_beep_sub, ++melody, melody->duration);	78	timeout(pccard_beep_sub, ++melody, (melody->duration * hz + 99) / 100);
79	} else	79	} else
80	allow_beep = BEEP_ON;	80	allow_beep = BEEP_ON;
81	}	81	}
Lines 88-95 Link Here
88		88
89	if (allow_beep == BEEP_ON && melody->pitch != NULL) {	89	if (allow_beep == BEEP_ON && melody->pitch != NULL) {
90	allow_beep = BEEP_OFF;	90	allow_beep = BEEP_OFF;
91	sysbeep(melody->pitch, melody->duration);	91	sysbeep(melody->pitch, (melody->duration * hz + 99) / 100);
92	timeout(pccard_beep_sub, ++melody, melody->duration);	92	timeout(pccard_beep_sub, ++melody, (melody->duration * hz + 99) / 100);
93	}	93	}
94	}	94	}
95		95
96	---