Merge pull request #1116 from ajcasado/master

Fix beep generation

Kernel/dev/cpc/video.s

@@ -336,8 +336,12 @@ reset_cursor_line:
         ld (de),a
 
         VIDEO_UNMAP
+<<<<<<< HEAD
+        ret
+=======
 	ret
 
+>>>>>>> 9e6066d9ba890c01777baba4e6bb5ef289d9b802
 	.if CPCVID_ONLY
 _do_beep:
 	.endif
@@ -349,7 +353,7 @@ cpc_do_beep:
         ld d,#2        ;channel C 110Hz
         call write_ay_reg
         ld e,#7          
-        ld d,#0x20       ;mixer->Only channel C
+        ld d,#0x3b       ;mixer->Only channel C
         call write_ay_reg
         ld e,#0xa
         ld d,#0x10      ;Use envelope on C
@@ -361,7 +365,8 @@ cpc_do_beep:
         ld d,#0x1      ;100ms envelope period
         call write_ay_reg
         ld e,#0xd
-        ld d,#0         ;Ramp down in one cicle and remain quiet
+        ld d,#0x9         ;Ramp down in one cicle and remain quiet
+        call write_ay_reg
         ret
 
 write_ay_reg: ; E = register, D = data from https://cpctech.cpc-live.com/source/sampplay.html

Kernel/platform/platform-cpc6128/README

@@ -47,7 +47,7 @@ Fix IDE driver. DONE
 Sometimes the top byte of the characters isn't drawn. FIXED
 Vertical scroll shows the bottom line of the screen in the top of the screen. FIXED
 Fix memory size reporting 64 v 48K (inherited from zx+3).
-do_beep() doesn't seem to work.
+do_beep() doesn't seem to work. FIXED
 Write a proper loader. DONE.
 Configurable screen, at least add 80x25, maybe also change the video mode and routines to manage 6x8 fonts.
 Support more hardware: M4 Board (storage, network and RTC), Ulifac/Usifac, networking with wifi module plugged in the usifac, sdcard in the Albireo, try slip with the serial port of the usifac...