Skip to content

Commit d9d2d02

Browse files
committed
chore: make names more consistent
1 parent 05c92e4 commit d9d2d02

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

src/machine/machine_rp2_usb.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func sendUSBPacket(ep uint32, data []byte, maxsize uint16) {
8383
} else {
8484
sendOnEP0DATADONE.offset = 0
8585
}
86-
inEpXdata0[ep] = true
86+
inEpXdata0[ep] = usbPIDData1
8787
}
8888

8989
sendViaEPIn(ep, data, count)
@@ -120,11 +120,11 @@ func handleEndpointRx(ep uint32) []byte {
120120
// AckUsbOutTransfer is called to acknowledge the completion of a USB OUT transfer.
121121
func AckUsbOutTransfer(ep uint32) {
122122
ep = ep & 0x7F
123-
setEPOutDataPID(ep, !outEpXdata0[ep])
123+
setOutEPDataPID(ep, !outEpXdata0[ep])
124124
}
125125

126126
// Set the USB endpoint Packet ID to DATA0 or DATA1.
127-
func setEPInDataPID(ep uint32, dataOne bool) {
127+
func setInEPDataPID(ep uint32, dataOne usbPID) {
128128
ep = ep & 0x7F
129129
inEpXdata0[ep] = dataOne
130130
if inEpXdata0[ep] || ep == 0 {
@@ -135,7 +135,7 @@ func setEPInDataPID(ep uint32, dataOne bool) {
135135
}
136136

137137
// Set the USB endpoint Packet ID to DATA0 or DATA1.
138-
func setEPOutDataPID(ep uint32, dataOne bool) {
138+
func setOutEPDataPID(ep uint32, dataOne usbPID) {
139139
outEpXdata0[ep] = dataOne
140140
if outEpXdata0[ep] || ep == 0 {
141141
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlData1Pid)
@@ -197,7 +197,7 @@ func (dev *USBDevice) ClearStallEPIn(ep uint32) {
197197
_usbDPSRAM.EPxBufferControl[ep].In.ClearBits(val)
198198
if inEpXPIDReset[ep] {
199199
// Reset the PID to DATA0
200-
setEPInDataPID(ep, false)
200+
setInEPDataPID(ep, usbPIDData0)
201201
}
202202
}
203203

@@ -208,7 +208,7 @@ func (dev *USBDevice) ClearStallEPOut(ep uint32) {
208208
_usbDPSRAM.EPxBufferControl[ep].Out.ClearBits(val)
209209
if outEpXPIDReset[ep] {
210210
// Reset the PID to DATA0
211-
setEPOutDataPID(ep, false)
211+
setOutEPDataPID(ep, usbPIDData0)
212212
}
213213
}
214214

@@ -237,10 +237,18 @@ type usbBuffer struct {
237237
Buffer1 [usbBufferLen]byte
238238
}
239239

240+
// USB Packet ID
241+
type usbPID bool
242+
243+
const (
244+
usbPIDData0 usbPID = false
245+
usbPIDData1 usbPID = true
246+
)
247+
240248
var (
241249
_usbDPSRAM = (*usbDPSRAM)(unsafe.Pointer(uintptr(0x50100000)))
242-
inEpXdata0 [16]bool
243-
outEpXdata0 [16]bool
250+
inEpXdata0 [16]usbPID
251+
outEpXdata0 [16]usbPID
244252
inEpXPIDReset [16]bool
245253
outEpXPIDReset [16]bool
246254
setupBytes [8]byte

0 commit comments

Comments
 (0)