Merge pull request #57 from 0xe2-0x9a-0x9b/master

Return []byte from func Memory.Data()
remogatto · Feb 26, 2013 · 9061e78 · 9061e78
2 parents 6b0b6ea + 263894d
commit 9061e78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/spectrum/memory.go b/src/spectrum/memory.go
@@ -108,8 +108,8 @@ func (memory *Memory) Write(address uint16, value byte, protectROM bool) {
 	}
 }
 
-func (memory *Memory) Data() *[0x10000]byte {
-	return &memory.data
+func (memory *Memory) Data() []byte {
+	return memory.data[:]
 }
 
 // Number of T-states to delay, for each possible T-state within a frame.

diff --git a/src/spectrum/ula.go b/src/spectrum/ula.go
@@ -187,7 +187,7 @@ func (ula *ULA) prepare(display *DisplayInfo) *DisplayData {
 		}
 
 		// Fill screen.bitmap & screen.attr, but only the dirty regions.
-		var memory_data *[0x10000]byte = ula.memory.Data()
+		var memory_data []byte = ula.memory.Data()
 		ula_bitmap := &ula.bitmap
 		ula_attr := &ula.attr
 		screen_dirty := &screen.Dirty