diff --git a/src/mame/drivers/atari_s2.c b/src/mame/drivers/atari_s2.c
index 681d923fb72..d1263095842 100644
--- a/src/mame/drivers/atari_s2.c
+++ b/src/mame/drivers/atari_s2.c
@@ -95,18 +95,103 @@ static ADDRESS_MAP_START( atari_s3_map, AS_PROGRAM, 8, atari_s2_state )
 ADDRESS_MAP_END
 
 static INPUT_PORTS_START( atari_s2 )
-	// dipswitches still to be described
 	PORT_START("DSW0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_DIPNAME( 0x07, 0x05, "Max Credits" )
+	PORT_DIPSETTING(    0x00, "5" )
+	PORT_DIPSETTING(    0x01, "10" )
+	PORT_DIPSETTING(    0x02, "15" )
+	PORT_DIPSETTING(    0x03, "20" )
+	PORT_DIPSETTING(    0x04, "25" )
+	PORT_DIPSETTING(    0x05, "30" )
+	PORT_DIPSETTING(    0x06, "35" )
+	PORT_DIPSETTING(    0x07, "40" )
+	PORT_DIPNAME( 0x08, 0x00, "Balls" )
+	PORT_DIPSETTING(    0x08, "5" )
+	PORT_DIPSETTING(    0x00, "3" )
+	PORT_DIPNAME( 0x50, 0x00, "Special" )
+	PORT_DIPSETTING(    0x10, "Extra Ball" )
+	PORT_DIPSETTING(    0x00, "Free Game" )
+	PORT_DIPSETTING(    0x40, "50000 points" )
+	PORT_DIPSETTING(    0x50, "60000 points" )
+	PORT_DIPNAME( 0x20, 0x00, "Free Play" )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x00, "Match" )
+	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 
 	PORT_START("DSW1")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_DIPNAME( 0x10, 0x00, "Upper Lanes" )
+	PORT_DIPSETTING(    0x10, "Start only" )
+	PORT_DIPSETTING(    0x00, "Start and Advance" )
+	PORT_DIPNAME( 0x60, 0x00, "Extra Ball reward" )
+	PORT_DIPSETTING(    0x00, "Extra Ball" )
+	PORT_DIPSETTING(    0x20, "20000 points" )
+	PORT_DIPSETTING(    0x60, "30000 points" )
 
 	PORT_START("DSW2")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_DIPNAME( 0x1f, 0x02, "Coinage L Chute" )
+	PORT_DIPSETTING(    0x02, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(    0x06, DEF_STR( 1C_3C ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( 1C_4C ) )
+	PORT_DIPSETTING(    0x0a, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(    0x0c, DEF_STR( 1C_6C ) )
+	PORT_DIPSETTING(    0x0e, DEF_STR( 1C_7C ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( 1C_8C ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( 1C_9C ) )
+	PORT_DIPSETTING(    0x11, "1 coin/10 credits" )
+	PORT_DIPSETTING(    0x12, "1 coin/11 credits" )
+	PORT_DIPSETTING(    0x13, "1 coin/12 credits" )
+	PORT_DIPSETTING(    0x14, "1 coin/13 credits" )
+	PORT_DIPSETTING(    0x15, "1 coin/14 credits" )
+	PORT_DIPSETTING(    0x16, "1 coin/15 credits" )
+	PORT_DIPSETTING(    0x03, DEF_STR( 2C_3C ) )
+	PORT_DIPSETTING(    0x05, DEF_STR( 2C_5C ) )
+	PORT_DIPSETTING(    0x07, DEF_STR( 2C_7C ) )
+	PORT_DIPSETTING(    0x09, "2 coins/9 credits" )
+	PORT_DIPSETTING(    0x0b, "2 coins/11 credits" )
+	PORT_DIPSETTING(    0x0d, "2 coins/13 credits" )
+	PORT_DIPSETTING(    0x0f, "2 coins/15 credits" )
+	PORT_DIPSETTING(    0x01, DEF_STR( 2C_1C ) )
+	PORT_BIT( 0x40, 0x00, IPT_UNUSED )
+	PORT_DIPNAME( 0x80, 0x00, "High Score Display" )
+	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 
 	PORT_START("DSW3")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_DIPNAME( 0x1f, 0x02, "Coinage R Chute" )
+	PORT_DIPSETTING(    0x02, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(    0x06, DEF_STR( 1C_3C ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( 1C_4C ) )
+	PORT_DIPSETTING(    0x0a, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(    0x0c, DEF_STR( 1C_6C ) )
+	PORT_DIPSETTING(    0x0e, DEF_STR( 1C_7C ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( 1C_8C ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( 1C_9C ) )
+	PORT_DIPSETTING(    0x11, "1 coin/10 credits" )
+	PORT_DIPSETTING(    0x12, "1 coin/11 credits" )
+	PORT_DIPSETTING(    0x13, "1 coin/12 credits" )
+	PORT_DIPSETTING(    0x14, "1 coin/13 credits" )
+	PORT_DIPSETTING(    0x15, "1 coin/14 credits" )
+	PORT_DIPSETTING(    0x16, "1 coin/15 credits" )
+	PORT_DIPSETTING(    0x03, DEF_STR( 2C_3C ) )
+	PORT_DIPSETTING(    0x05, DEF_STR( 2C_5C ) )
+	PORT_DIPSETTING(    0x07, DEF_STR( 2C_7C ) )
+	PORT_DIPSETTING(    0x09, "2 coins/9 credits" )
+	PORT_DIPSETTING(    0x0b, "2 coins/11 credits" )
+	PORT_DIPSETTING(    0x0d, "2 coins/13 credits" )
+	PORT_DIPSETTING(    0x0f, "2 coins/15 credits" )
+	PORT_DIPSETTING(    0x01, DEF_STR( 2C_1C ) )
+	PORT_DIPNAME( 0x20, 0x00, "Ladder Memory" )
+	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0xc0, 0x00, "Replays for High Score" )
+	PORT_DIPSETTING(    0xc0, "1" )
+	PORT_DIPSETTING(    0x00, "2" )
+	PORT_DIPSETTING(    0x80, "3" )
 
 	PORT_START("DSW4")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )