diff --git a/hash/icanguit.xml b/hash/icanguit.xml
index fad09b113e3..8f997871817 100644
--- a/hash/icanguit.xml
+++ b/hash/icanguit.xml
@@ -9,7 +9,7 @@ license:CC0-1.0
*Barbie Guitar Party (K9901)
*Hot Wheels Road Tunes (K9902)
- *Spongebob Squarepants Surf's Up (K9903)
+ *SpongeBob SquarePants Surf's Up (K9903)
(is there a K9904?)
diff --git a/hash/jakks_gamekey_nk.xml b/hash/jakks_gamekey_nk.xml
index c0428fc456c..7b344da50f6 100644
--- a/hash/jakks_gamekey_nk.xml
+++ b/hash/jakks_gamekey_nk.xml
@@ -34,7 +34,7 @@ license:CC0-1.0
- Spongebob Sponge Pop & Snowball Showdown (15 AUGUST 2005 D)
+ SpongeBob Sponge Pop & Snowball Showdown (15 AUGUST 2005 D)
2005
JAKKS Pacific / HotGen Ltd
diff --git a/hash/leapfrog_didj_cart.xml b/hash/leapfrog_didj_cart.xml
index 1b19c86bd56..51b06bb6881 100644
--- a/hash/leapfrog_didj_cart.xml
+++ b/hash/leapfrog_didj_cart.xml
@@ -47,13 +47,13 @@
- Nickelodeon Spongebob Squarepants - Fists of Foam (USA)
+ Nickelodeon SpongeBob SquarePants - Fists of Foam (USA)
2008
LeapFrog
-
+
diff --git a/hash/leapfrog_leappad_cart.xml b/hash/leapfrog_leappad_cart.xml
index b160338380c..1cbf25c023e 100644
--- a/hash/leapfrog_leappad_cart.xml
+++ b/hash/leapfrog_leappad_cart.xml
@@ -678,7 +678,7 @@ license:CC0-1.0
- Spongebob Schwammkopf - Meeres-Geschichten (Germany)
+ SpongeBob Schwammkopf - Meeres-Geschichten (Germany)
2003
LeapFrog
@@ -687,7 +687,7 @@ license:CC0-1.0
-
+
diff --git a/hash/leapster.xml b/hash/leapster.xml
index ac563f58619..ceda3abd6f9 100644
--- a/hash/leapster.xml
+++ b/hash/leapster.xml
@@ -7,7 +7,7 @@ Known games listed by part-no, (*) denotes undumped, (**) denotes acquired but n
| PART-NO |LAN| GAME TITLE | CARTRIDGE-TYPE | DUMPED | Notes
===============================================================================================================================
-| 500-01168 |ENG| Spongebob Squarepants - Saves the Day | LEAPSTER | YES | Same ROM as 500-11002
+| 500-01168 |ENG| SpongeBob SquarePants - Saves the Day | LEAPSTER | YES | Same ROM as 500-11002
| 500-01169 |ENG| 1st Grade | LEAPSTER | YES | Same ROM as 500-11000
| 500-01170 |ENG| Kindergarten | LEAPSTER | YES |
| 500-01171 |ENG| Dora the Explorer - Animal Rescuer | LEAPSTER | YES |
@@ -23,14 +23,14 @@ Known games listed by part-no, (*) denotes undumped, (**) denotes acquired but n
| 500-10812-A |ENG| The Incredibles | LEAPSTER | YES |
| 500-10825-A |ENG| Spider-Man - The Case of the Sinister Speller | LEAPSTER | YES |
| 500-10829-A |ENG| Reading with Phonics - Mole's Huge Nose | LEAPSTER | YES |
-| 500-10933-A |GER| Spongebob Schwammkopf hat alles im Griff | LEAPSTER | YES |
+| 500-10933-A |GER| SpongeBob Schwammkopf hat alles im Griff | LEAPSTER | YES |
| 500-10934-A |GER| Vorschule | LEAPSTER | YES |
| 500-10935-A |GER| Grundschule 1 | LEAPSTER | YES |
| 500-10957-A |ENG| 2nd Grade - Musical Menace | LEAPSTER | YES |
| 500-10999 |ENG| Kindergarten | LEAPSTER | YES |
| 500-11000 |ENG| 1st Grade | LEAPSTER | YES | Same ROM as 500-01169
| 500-11001 |ENG| Dora the Explorer - Wildlife Rescue | LEAPSTER | YES | Two sets with the same serial
-| 500-11002 |ENG| Spongebob Squarepants - Saves the Day | LEAPSTER | YES | Same ROM as 500-01168
+| 500-11002 |ENG| SpongeBob SquarePants - Saves the Day | LEAPSTER | YES | Same ROM as 500-01168
| 500-11003 |ENG| Mr. Pencil's Learn to Draw & Write | LEAPSTER | YES | Two sets with the same serial
| 500-11004 |ENG| Math Baseball | LEAPSTER | YES | Same ROM as 500-10441
| 500-11006 |ENG| Talking WORDS Factory | LEAPSTER | YES |
@@ -57,7 +57,7 @@ Known games listed by part-no, (*) denotes undumped, (**) denotes acquired but n
| 500-11898-A |ENG| Scholastic - Math Missions | LEAPSTER | YES |
| 500-11903-A |ENG| Spider-Man - The Case of The Sinister Speller | LEAPSTER L-MAX | YES |
| 500-11904-A |ENG| Dora the Explorer - Wildlife Rescue | LEAPSTER L-MAX | YES |
-| 500-11905-A |ENG| Spongebob Squarepants - Saves the Day | LEAPSTER L-MAX | YES |
+| 500-11905-A |ENG| SpongeBob SquarePants - Saves the Day | LEAPSTER L-MAX | YES |
| 500-11929-A |ENG| Scholastic I Spy - Challenger | LEAPSTER | YES |
| 500-11966-A |ENG| Disney Princess | LEAPSTER | YES |
| 500-11972-A |GER| Batman - Multipliziere, dividiere und reagiere | LEAPSTER | YES |
@@ -110,7 +110,7 @@ Known games listed by part-no, (*) denotes undumped, (**) denotes acquired but n
| 500-12713-A |ENG| Disney Princess - Worlds of Enchantment | LEAPSTER | YES |
| 500-12715-A |ENG| Foster's Home for Imaginary Friends | LEAPSTER | YES |
| 500-12718-A |ENG| Go Diego Go! - Animal Rescuer | LEAPSTER | YES |
-| 500-12719-A |ENG| Spongebob Squarepants - Through The Wormhole | LEAPSTER | YES |
+| 500-12719-A |ENG| SpongeBob SquarePants - Through The Wormhole | LEAPSTER | YES |
| 500-12738-A |GER| Ratatouille | LEAPSTER | YES |
| 500-12798-A |UK | Noddy - Rainbow Adventures | LEAPSTER | NO |
| 500-12799-A |FRA| Oui-Oui - Aventures Au Pays Des Jouet | LEAPSTER | YES |
@@ -118,7 +118,7 @@ Known games listed by part-no, (*) denotes undumped, (**) denotes acquired but n
| 500-12824-A |SPA| Perrito Club - ¡Adopta Un Nuevo Amiguito Y Aprende! | LEAPSTER | YES |
| 500-12830-A |SPA| The Batman - El Poder De Los Números | LEAPSTER | YES |
| 500-13272-A |ENG| Wall-E | LEAPSTER | YES |
-| 500-13273-A |GER| Spongebob Schwammkopf - Zeitreise durch das Wurmloch | LEAPSTER | YES |
+| 500-13273-A |GER| SpongeBob Schwammkopf - Zeitreise durch das Wurmloch | LEAPSTER | YES |
| 500-13298-A |ENG| I Spy - Treasure Hunt! | LEAPSTER | YES |
| 500-13299-A |ENG| Scholastic OutWit! | LEAPSTER | YES |
| 500-13306-A |ENG| Star Wars - Jedi Math | LEAPSTER | YES |
@@ -133,7 +133,7 @@ Known games listed by part-no, (*) denotes undumped, (**) denotes acquired but n
| 500-13446-A |ENG| Pet Pals | LEAPSTER | YES |
| 500-13447-A |ENG| Go Diego Go! - Animal Rescuer | LEAPSTER | YES |
| 500-13448-A |ENG| Disney Princess - Worlds of Enchantment | LEAPSTER | YES |
-| 500-13451-A |ENG| Spongebob Squarepants - Saves the Day | LEAPSTER | YES |
+| 500-13451-A |ENG| SpongeBob SquarePants - Saves the Day | LEAPSTER | YES |
| 500-13453-A |ENG| The Backyardigans | LEAPSTER | YES |
| 500-13470-A |UK | Star Wars - Jedi Maths | LEAPSTER | NO |
| 500-13472-A |ENG| Star Wars - Jedi Reading | LEAPSTER | YES |
@@ -1304,7 +1304,7 @@ Entries are ordered by title of the parent, clones are list after the parent, Le
- Spongebob Squarepants - Saves the Day (USA)
+ SpongeBob SquarePants - Saves the Day (USA)
2003
LeapFrog
@@ -1316,7 +1316,7 @@ Entries are ordered by title of the parent, clones are list after the parent, Le
- Spongebob Squarepants - Saves the Day (USA, alt)
+ SpongeBob SquarePants - Saves the Day (USA, alt)
2003
LeapFrog
@@ -1340,7 +1340,7 @@ Entries are ordered by title of the parent, clones are list after the parent, Le
- Spongebob Schwammkopf Hat Alles im Griff (Germany)
+ SpongeBob Schwammkopf Hat Alles im Griff (Germany)
2003
LeapFrog
@@ -1352,7 +1352,7 @@ Entries are ordered by title of the parent, clones are list after the parent, Le
- Spongebob Squarepants - Through The Wormhole (USA)
+ SpongeBob SquarePants - Through The Wormhole (USA)
2003
LeapFrog
@@ -1364,7 +1364,7 @@ Entries are ordered by title of the parent, clones are list after the parent, Le
- Spongebob Schwammkopf - Zeitreise durch das Wurmloch (Germany)
+ SpongeBob Schwammkopf - Zeitreise durch das Wurmloch (Germany)
2003
LeapFrog
@@ -1763,7 +1763,7 @@ Entries are ordered by title of the parent, clones are list after the parent, Le
- Spongebob Squarepants - Saves the Day (USA, L-MAX)
+ SpongeBob SquarePants - Saves the Day (USA, L-MAX)
2005
LeapFrog
diff --git a/hash/mobigo_cart.xml b/hash/mobigo_cart.xml
index 2670c84ebca..44b9810eb15 100644
--- a/hash/mobigo_cart.xml
+++ b/hash/mobigo_cart.xml
@@ -360,25 +360,25 @@ license:CC0-1.0
- Nickelodeon Spongebob SquarePants - Defending the Secret Formula (USA)
+ Nickelodeon SpongeBob SquarePants - Defending the Secret Formula (USA)
2011
VTech
-
+
- Nickelodeon Spongebob Schwammkopf - Rette das Geheimrezept (Germany)
+ Nickelodeon SpongeBob Schwammkopf - Rette das Geheimrezept (Germany)
2011
VTech
-
+
diff --git a/hash/pi_storyreader_cart.xml b/hash/pi_storyreader_cart.xml
index 712feba55cc..46fe7e30873 100644
--- a/hash/pi_storyreader_cart.xml
+++ b/hash/pi_storyreader_cart.xml
@@ -228,7 +228,7 @@ license:CC0-1.0
- Spongebob Squarepants Grand Price Winner!
+ SpongeBob SquarePants Grand Price Winner!
200?
Publications International Ltd. / Disney
@@ -240,7 +240,7 @@ license:CC0-1.0
- Spongebob Squarepants Grand Price Winner! / Dora's Garden Adventure / Blue's Perfect Picnic Spot
+ SpongeBob SquarePants Grand Price Winner! / Dora's Garden Adventure / Blue's Perfect Picnic Spot
200?
Publications International Ltd. / Disney
diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml
index 3f053b24fec..f4b83c2bf4b 100644
--- a/hash/vsmile_cart.xml
+++ b/hash/vsmile_cart.xml
@@ -403,12 +403,12 @@ Regular game cartridges
| XX | 80-092427(SP) | Buscando a Nemo - Los Descubrimientos de Nemo (52-92427(SP) on back label) |
| | (CN) | 海底总动员 |
+========+===================+================================================================================================+
-| XX | 80-092440(US) | Spongebob Squarepants - A Day In The Life of A Sponge |
-| XX | 80-092441(IT) | Spongebob - Un giorno da Spugna (no serial printed on cart) |
-| XX | 80-092442(NL) | Spongebob Squarepants - Een Dag uit het Leven van een Spons (52-92442(NL) on back label) |
-| | 80-092443(UK) | Spongebob Squarepants - A Day In The Life of A Sponge |
-| XX | 80-092444(GE) | Spongebob Schwammkopf - Der Tag des Schwamms |
-| XX | 80-092444(GE) | Spongebob Schwammkopf - Der Tag des Schwamms (rev. 1) |
+| XX | 80-092440(US) | SpongeBob SquarePants - A Day In The Life of A Sponge |
+| XX | 80-092441(IT) | SpongeBob - Un giorno da Spugna (no serial printed on cart) |
+| XX | 80-092442(NL) | SpongeBob SquarePants - Een Dag uit het Leven van een Spons (52-92442(NL) on back label) |
+| | 80-092443(UK) | SpongeBob SquarePants - A Day In The Life of A Sponge |
+| XX | 80-092444(GE) | SpongeBob Schwammkopf - Der Tag des Schwamms |
+| XX | 80-092444(GE) | SpongeBob Schwammkopf - Der Tag des Schwamms (rev. 1) |
| XX | 80-092445(FR) | Bob L'éponge - Une journée dans la vie d'une éponge |
| XX | 80-092447(SP) | Bob Esponja - Un día en la vida de una esponja (52-92447(SP) on back label) |
+========+===================+================================================================================================+
@@ -4137,7 +4137,7 @@ V.Smile Smartbook Smartidges (need a Smartbook touch tablet connected to a regul
- Nickelodeon Spongebob Squarepants - A Day in the Life of a Sponge (USA)
+ Nickelodeon SpongeBob SquarePants - A Day in the Life of a Sponge (USA)
2005?
VTech
@@ -4154,7 +4154,7 @@ V.Smile Smartbook Smartidges (need a Smartbook touch tablet connected to a regul
- Nickelodeon Spongebob - Un giorno da Spugna (Italy)
+ Nickelodeon SpongeBob - Un giorno da Spugna (Italy)
2006
VTech / Giochi Preziosi
@@ -4163,13 +4163,13 @@ V.Smile Smartbook Smartidges (need a Smartbook touch tablet connected to a regul
-
+
- Nickelodeon Spongebob Squarepants - Een Dag uit het Leven van een Spons (Netherlands)
+ Nickelodeon SpongeBob SquarePants - Een Dag uit het Leven van een Spons (Netherlands)
2006
VTech / Giochi Preziosi
@@ -4178,13 +4178,13 @@ V.Smile Smartbook Smartidges (need a Smartbook touch tablet connected to a regul
-
+
- Nickelodeon Spongebob Schwammkopf - Der Tag des Schwamms (Germany, rev. 1)
+ Nickelodeon SpongeBob Schwammkopf - Der Tag des Schwamms (Germany, rev. 1)
2005?
VTech
@@ -4201,7 +4201,7 @@ V.Smile Smartbook Smartidges (need a Smartbook touch tablet connected to a regul
- Nickelodeon Spongebob Schwammkopf - Der Tag des Schwamms (Germany)
+ Nickelodeon SpongeBob Schwammkopf - Der Tag des Schwamms (Germany)
2005?
VTech
diff --git a/hash/vsmile_cd.xml b/hash/vsmile_cd.xml
index 4bae545b062..77102ae9ea7 100644
--- a/hash/vsmile_cd.xml
+++ b/hash/vsmile_cd.xml
@@ -30,9 +30,9 @@ ________________________________________________________________________________
| 80-093025(FR) | Les Indestructibles - Les Indestructibles à la Rescousse
*** | 80-093027(SP) | Los Increíbles - Misión Increíble
__________________________________________________________________________________________
- *** | 80-093040(US) | Nickelodeon SpongeBob Squarepants - Idea Sponge [Needs revision checking]
- *** | 80-093040(US) | Nickelodeon SpongeBob Squarepants - Idea Sponge (Rev. 1)
- *** | 80-093040(US) | Nickelodeon SpongeBob Squarepants - Idea Sponge (Rev. 2)
+ *** | 80-093040(US) | Nickelodeon SpongeBob SquarePants - Idea Sponge [Needs revision checking]
+ *** | 80-093040(US) | Nickelodeon SpongeBob SquarePants - Idea Sponge (Rev. 1)
+ *** | 80-093040(US) | Nickelodeon SpongeBob SquarePants - Idea Sponge (Rev. 2)
*** | 80-093044(GE) | Nick SpongeBob Schwammkopf - Ein Schwamm voller Ideen
| 80-093045(FR) | Nickelodeon Bob L'éponge - Une Idée Spongieuse
*** | 80-093047(SP) | Nickelodeon Bob Esponja - Misión Esponja
@@ -85,7 +85,7 @@ ________________________________________________________________________________
__________________________________________________________________________________________
-->
-
@@ -561,7 +561,7 @@ ________________________________________________________________________________
Ring 2: "*59-93040-000-000*", "IFPI LQ24", "IFPI 9QH8", "59-93040-000"
-->
- Nickelodeon SpongeBob Squarepants - Idea Sponge (USA, Rev. 2)
+ Nickelodeon SpongeBob SquarePants - Idea Sponge (USA, Rev. 2)
200?
VTech
@@ -580,7 +580,7 @@ ________________________________________________________________________________
Ring 1: "*59-93040-000-000", "IFPI LQ50", "IFPI 9QH8", "59-93040-000"
-->
- Nickelodeon SpongeBob Squarepants - Idea Sponge (USA, Rev. 1)
+ Nickelodeon SpongeBob SquarePants - Idea Sponge (USA, Rev. 1)
200?
VTech
@@ -600,7 +600,7 @@ ________________________________________________________________________________
-->
- Nickelodeon SpongeBob Squarepants - Idea Sponge (USA)
+ Nickelodeon SpongeBob SquarePants - Idea Sponge (USA)
200?
VTech
diff --git a/hash/vsmilem_cart.xml b/hash/vsmilem_cart.xml
index 8be4ce72107..d4b4c0b40d5 100644
--- a/hash/vsmilem_cart.xml
+++ b/hash/vsmilem_cart.xml
@@ -231,8 +231,8 @@ Language:
| XX | 80-084625(FR) | Le Monde de Nemo - Nemo à la decourverte de l'océan |
| | 80-084627(SP) | Buscando a Nemo - Los Descubrimientos de Nemo |
+========+===================+===========================================================================================+
-| | 80-084640(US) | (Should be Orange colored Spongebob) |
-| XX | 80-084644(GE) | Spongebob Schwammkopf - Der Tag des Schwamms |
+| | 80-084640(US) | (Should be Orange colored SpongeBob) |
+| XX | 80-084644(GE) | SpongeBob Schwammkopf - Der Tag des Schwamms |
| | 80-084647(SP) | Bob Esponja - Un día en la vida de una esponja |
+========+===================+===========================================================================================+
@@ -1310,7 +1310,7 @@ Language:
- Nickelodeon Spongebob Schwammkopf - Der Tag des Schwamms (Germany)
+ Nickelodeon SpongeBob Schwammkopf - Der Tag des Schwamms (Germany)
2011
VTech
diff --git a/hash/vtech_storio_cart.xml b/hash/vtech_storio_cart.xml
index 56c738deeb8..8f93714008f 100644
--- a/hash/vtech_storio_cart.xml
+++ b/hash/vtech_storio_cart.xml
@@ -74,7 +74,7 @@ license:CC0-1.0
| 80-281204(GER) | Disney/Pixar Cars Toon - Hook in Tokyo
| 80-281300(US) | Sesame Street - The Happy Scientists
| 80-281400(US) | SpongeBob SquarePants - Model Sponge
- XX | 80-281404(GER) | Spongebob Schwammkopf - Ein Schwamm will nach oben
+ XX | 80-281404(GER) | SpongeBob Schwammkopf - Ein Schwamm will nach oben
| 80-281405(FR) | Bob L'éponge - Bob, la star des éponges
| 80-281422(SP) | Bob Esponja - Modelo Esponja
| 80-281500(US) | Tangled
@@ -204,12 +204,12 @@ license:CC0-1.0
- Spongebob Schwammkopf - Ein Schwamm will nach oben (Germany)
+ SpongeBob Schwammkopf - Ein Schwamm will nach oben (Germany)
2011
VTech
-
+
diff --git a/src/devices/sound/msm5232.cpp b/src/devices/sound/msm5232.cpp
index 0e8a8676f5e..b7090aaef0a 100644
--- a/src/devices/sound/msm5232.cpp
+++ b/src/devices/sound/msm5232.cpp
@@ -110,7 +110,7 @@ void msm5232_device::device_reset()
void msm5232_device::device_stop()
{
- #ifdef SAVE_SAMPLE
+#ifdef SAVE_SAMPLE
fclose(sample[8]);
#endif
#ifdef SAVE_SEPARATE_CHANNELS
@@ -127,22 +127,22 @@ void msm5232_device::device_stop()
void msm5232_device::set_capacitors(double cap1, double cap2, double cap3, double cap4, double cap5, double cap6, double cap7, double cap8)
{
- m_external_capacity[0] = cap1;
- m_external_capacity[1] = cap2;
- m_external_capacity[2] = cap3;
- m_external_capacity[3] = cap4;
- m_external_capacity[4] = cap5;
- m_external_capacity[5] = cap6;
- m_external_capacity[6] = cap7;
- m_external_capacity[7] = cap8;
+ m_external_capacitance[0] = cap1;
+ m_external_capacitance[1] = cap2;
+ m_external_capacitance[2] = cap3;
+ m_external_capacitance[3] = cap4;
+ m_external_capacitance[4] = cap5;
+ m_external_capacitance[5] = cap6;
+ m_external_capacitance[6] = cap7;
+ m_external_capacitance[7] = cap8;
}
-/* Default chip clock is 2119040 Hz */
-/* At this clock chip generates exactly 440.0 Hz signal on 8' output when pitch data=0x21 */
+// Default chip clock is 2119040 Hz
+// At this clock chip generates exactly 440.0 Hz signal on 8' output when pitch data=0x21
-/* ROM table to convert from pitch data into data for programmable counter and binary counter */
-/* Chip has 88x12bits ROM (addressing (in hex) from 0x00 to 0x57) */
+// ROM table to convert from pitch data into data for programmable counter and binary counter
+// Chip has 88x12bits ROM (addressing (in hex) from 0x00 to 0x57)
#define ROM(counter,bindiv) (counter|(bindiv<<9))
static const uint16_t MSM5232_ROM[88]={
@@ -199,7 +199,7 @@ static FILE *sample[9];
/*
- * Resistance values are guesswork, default capacity is mentioned in the datasheets
+ * Resistance values are guesswork, default capacitance is mentioned in the datasheets
*
* Two errors in the datasheet, one probable, one certain
* - it mentions 0.39uF caps, but most boards have 1uF caps and expect datasheet timings
@@ -280,9 +280,9 @@ void msm5232_device::init_tables()
void msm5232_device::init_voice(int i)
{
- m_voi[i].ar_rate= m_ar_tbl[0] * m_external_capacity[i];
- m_voi[i].dr_rate= m_dr_tbl[0] * m_external_capacity[i];
- m_voi[i].rr_rate= m_dr_tbl[0] * m_external_capacity[i]; /* this is constant value */
+ m_voi[i].ar_rate= m_ar_tbl[0] * m_external_capacitance[i];
+ m_voi[i].dr_rate= m_dr_tbl[0] * m_external_capacitance[i];
+ m_voi[i].rr_rate= m_dr_tbl[0] * m_external_capacitance[i]; /* this is constant value */
m_voi[i].eg_sect= -1;
m_voi[i].eg = 0.0;
m_voi[i].eg_arm = 0;
@@ -387,22 +387,22 @@ void msm5232_device::write(offs_t offset, uint8_t data)
{
case 0x08: /* group1 attack */
for (i=0; i<4; i++)
- m_voi[i].ar_rate = m_ar_tbl[data&0x7] * m_external_capacity[i];
+ m_voi[i].ar_rate = m_ar_tbl[data&0x7] * m_external_capacitance[i];
break;
case 0x09: /* group2 attack */
for (i=0; i<4; i++)
- m_voi[i+4].ar_rate = m_ar_tbl[data&0x7] * m_external_capacity[i+4];
+ m_voi[i+4].ar_rate = m_ar_tbl[data&0x7] * m_external_capacitance[i+4];
break;
case 0x0a: /* group1 decay */
for (i=0; i<4; i++)
- m_voi[i].dr_rate = m_dr_tbl[data&0xf] * m_external_capacity[i];
+ m_voi[i].dr_rate = m_dr_tbl[data&0xf] * m_external_capacitance[i];
break;
case 0x0b: /* group2 decay */
for (i=0; i<4; i++)
- m_voi[i+4].dr_rate = m_dr_tbl[data&0xf] * m_external_capacity[i+4];
+ m_voi[i+4].dr_rate = m_dr_tbl[data&0xf] * m_external_capacitance[i+4];
break;
case 0x0c: /* group1 control */
diff --git a/src/devices/sound/msm5232.h b/src/devices/sound/msm5232.h
index 552cd7669e3..56b562b2c76 100644
--- a/src/devices/sound/msm5232.h
+++ b/src/devices/sound/msm5232.h
@@ -6,8 +6,7 @@
#pragma once
-class msm5232_device : public device_t,
- public device_sound_interface
+class msm5232_device : public device_t, public device_sound_interface
{
public:
msm5232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -35,24 +34,24 @@ private:
int TG_count_period;
int TG_count;
- uint8_t TG_cnt; /* 7 bits binary counter (frequency output) */
- uint8_t TG_out16; /* bit number (of TG_cnt) for 16' output */
- uint8_t TG_out8; /* bit number (of TG_cnt) for 8' output */
- uint8_t TG_out4; /* bit number (of TG_cnt) for 4' output */
- uint8_t TG_out2; /* bit number (of TG_cnt) for 2' output */
+ uint8_t TG_cnt; // 7 bits binary counter (frequency output)
+ uint8_t TG_out16; // bit number (of TG_cnt) for 16' output
+ uint8_t TG_out8; // bit number (of TG_cnt) for 8' output
+ uint8_t TG_out4; // bit number (of TG_cnt) for 4' output
+ uint8_t TG_out2; // bit number (of TG_cnt) for 2' output
int egvol;
int eg_sect;
int counter;
int eg;
- uint8_t eg_arm; /* attack/release mode */
+ uint8_t eg_arm; // attack/release mode
double ar_rate;
double dr_rate;
double rr_rate;
- int pitch; /* current pitch data */
+ int pitch; // current pitch data
int GF;
};
@@ -62,32 +61,32 @@ private:
VOICE m_voi[8];
- uint32_t m_EN_out16[2]; /* enable 16' output masks for both groups (0-disabled ; ~0 -enabled) */
- uint32_t m_EN_out8[2]; /* enable 8' output masks */
- uint32_t m_EN_out4[2]; /* enable 4' output masks */
- uint32_t m_EN_out2[2]; /* enable 2' output masks */
+ uint32_t m_EN_out16[2]; // enable 16' output masks for both groups (0-disabled ; ~0 -enabled)
+ uint32_t m_EN_out8[2]; // enable 8' output masks
+ uint32_t m_EN_out4[2]; // enable 4' output masks
+ uint32_t m_EN_out2[2]; // enable 2' output masks
int m_noise_cnt;
int m_noise_step;
int m_noise_rng;
- int m_noise_clocks; /* number of the noise_rng (output) level changes */
+ int m_noise_clocks; // number of the noise_rng (output) level changes
unsigned int m_UpdateStep;
- /* rate tables */
+ // rate tables
double m_ar_tbl[8];
double m_dr_tbl[16];
- uint8_t m_control1;
- uint8_t m_control2;
+ uint8_t m_control1;
+ uint8_t m_control2;
- int m_gate; /* current state of the GATE output */
+ int m_gate; // current state of the GATE output
- int m_chip_clock; /* chip clock in Hz */
- int m_rate; /* sample rate in Hz */
+ int m_chip_clock; // chip clock in Hz
+ int m_rate; // sample rate in Hz
- double m_external_capacity[8]; /* in Farads, eg 0.39e-6 = 0.36 uF (microFarads) */
- devcb_write_line m_gate_handler_cb;/* callback called when the GATE output pin changes state */
+ double m_external_capacitance[8]; // in Farads, eg 0.39e-6 = 0.36 uF (microFarads)
+ devcb_write_line m_gate_handler_cb;// callback called when the GATE output pin changes state
void init_tables();
void init_voice(int i);