tinygo-org/drivers
1
0
Fork 0
mirror of https://github.com/tinygo-org/drivers.git synced 2026-08-18 21:53:56 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

rtl8720dn: refactor by bringing this driver more in line with wifinina and espat

Browse Source 
Signed-off-by: deadprogram <ron@hybridgroup.com>
This commit is contained in:
deadprogram
2022-08-28 10:40:36 +02:00
committed by Ron Evans
parent 6f05615f3e
commit 54ddb895cc
6 changed files with 171 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtl8720dn/netdriver.go
+74 -74
View File
@@ -7,27 +7,27 @@ import (
// Here is the implementation of tinygo-org/x/drivers/net.DeviceDriver.
func (r *RTL8720DN) GetDNS(domain string) (string, error) {
if r.debug {
func (d *Driver) GetDNS(domain string) (string, error) {
if d.debug {
fmt.Printf("GetDNS(%q)\r\n", domain)
}
ipaddr := make([]byte, 4)
_, err := r.Rpc_netconn_gethostbyname(domain, &ipaddr)
_, err := d.Rpc_netconn_gethostbyname(domain, &ipaddr)
if err != nil {
return "", err
}
ret, err := fmt.Sprintf("%d.%d.%d.%d", ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]), nil
if r.debug {
if d.debug {
fmt.Printf("-> %s\r\n", ret)
fmt.Printf("-> %02X.%02X.%02X.%02X\r\n", ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3])
}
return ret, err
}
func (r *RTL8720DN) ConnectTCPSocket(addr, port string) error {
if r.debug {
func (d *Driver) ConnectTCPSocket(addr, port string) error {
if d.debug {
fmt.Printf("ConnectTCPSocket(%q, %q)\r\n", addr, port)
}
@@ -35,7 +35,7 @@ func (r *RTL8720DN) ConnectTCPSocket(addr, port string) error {
if len(addr) == 4 {
copy(ipaddr, addr)
} else {
_, err := r.Rpc_netconn_gethostbyname(addr, &ipaddr)
_, err := d.Rpc_netconn_gethostbyname(addr, &ipaddr)
if err != nil {
return err
}
@@ -46,19 +46,19 @@ func (r *RTL8720DN) ConnectTCPSocket(addr, port string) error {
return err
}
socket, err := r.Rpc_lwip_socket(0x02, 0x01, 0x00)
socket, err := d.Rpc_lwip_socket(0x02, 0x01, 0x00)
if err != nil {
return err
}
r.socket = socket
r.connectionType = ConnectionTypeTCP
d.socket = socket
d.connectionType = ConnectionTypeTCP
_, err = r.Rpc_lwip_fcntl(socket, 0x00000003, 0x00000000)
_, err = d.Rpc_lwip_fcntl(socket, 0x00000003, 0x00000000)
if err != nil {
return err
}
_, err = r.Rpc_lwip_fcntl(socket, 0x00000004, 0x00000001)
_, err = d.Rpc_lwip_fcntl(socket, 0x00000004, 0x00000001)
if err != nil {
return err
}
@@ -71,7 +71,7 @@ func (r *RTL8720DN) ConnectTCPSocket(addr, port string) error {
name[6] = byte(ipaddr[2])
name[7] = byte(ipaddr[3])
_, err = r.Rpc_lwip_connect(socket, name, uint32(len(name)))
_, err = d.Rpc_lwip_connect(socket, name, uint32(len(name)))
if err != nil {
return err
}
@@ -80,24 +80,24 @@ func (r *RTL8720DN) ConnectTCPSocket(addr, port string) error {
writeset := []byte{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
exceptset := []byte{}
timeout := []byte{}
_, err = r.Rpc_lwip_select(0x01, readset, writeset, exceptset, timeout)
_, err = d.Rpc_lwip_select(0x01, readset, writeset, exceptset, timeout)
if err != nil {
return err
}
optval := make([]byte, 4)
optlen := uint32(len(optval))
_, err = r.Rpc_lwip_getsockopt(socket, 0x00000FFF, 0x00001007, []byte{0xA5, 0xA5, 0xA5, 0xA5}, &optval, &optlen)
_, err = d.Rpc_lwip_getsockopt(socket, 0x00000FFF, 0x00001007, []byte{0xA5, 0xA5, 0xA5, 0xA5}, &optval, &optlen)
if err != nil {
return err
}
_, err = r.Rpc_lwip_fcntl(socket, 0x00000003, 0x00000000)
_, err = d.Rpc_lwip_fcntl(socket, 0x00000003, 0x00000000)
if err != nil {
return err
}
_, err = r.Rpc_lwip_fcntl(socket, 0x00000004, 0x00000000)
_, err = d.Rpc_lwip_fcntl(socket, 0x00000004, 0x00000000)
if err != nil {
return err
}
@@ -106,7 +106,7 @@ func (r *RTL8720DN) ConnectTCPSocket(addr, port string) error {
writeset = []byte{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
exceptset = []byte{}
timeout = []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x42, 0x0F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF}
_, err = r.Rpc_lwip_select(0x01, readset, writeset, exceptset, timeout)
_, err = d.Rpc_lwip_select(0x01, readset, writeset, exceptset, timeout)
if err != nil {
return err
}
@@ -114,63 +114,63 @@ func (r *RTL8720DN) ConnectTCPSocket(addr, port string) error {
return nil
}
func (r *RTL8720DN) ConnectSSLSocket(addr, port string) error {
if r.debug {
func (d *Driver) ConnectSSLSocket(addr, port string) error {
if d.debug {
fmt.Printf("ConnectSSLSocket(%q, %q)\r\n", addr, port)
}
if r.root_ca == nil {
if d.root_ca == nil {
return fmt.Errorf("root_ca is not set")
}
client, err := r.Rpc_wifi_ssl_client_create()
client, err := d.Rpc_wifi_ssl_client_create()
if err != nil {
return err
}
r.client = client
r.connectionType = ConnectionTypeTLS
d.client = client
d.connectionType = ConnectionTypeTLS
err = r.Rpc_wifi_ssl_init(client)
err = d.Rpc_wifi_ssl_init(client)
if err != nil {
return err
}
err = r.Rpc_wifi_ssl_set_timeout(client, 0x0001D4C0)
err = d.Rpc_wifi_ssl_set_timeout(client, 0x0001D4C0)
if err != nil {
return err
}
_, err = r.Rpc_wifi_ssl_set_rootCA(client, *r.root_ca)
_, err = d.Rpc_wifi_ssl_set_rootCA(client, *d.root_ca)
if err != nil {
return err
}
// TODO: use port
_, err = r.Rpc_wifi_start_ssl_client(client, addr, 443, 0x0001D4C0)
_, err = d.Rpc_wifi_start_ssl_client(client, addr, 443, 0x0001D4C0)
if err != nil {
return err
}
_, err = r.Rpc_wifi_ssl_get_socket(client)
_, err = d.Rpc_wifi_ssl_get_socket(client)
if err != nil {
return err
}
return nil
}
func (r *RTL8720DN) ConnectUDPSocket(addr, sendport, listenport string) error {
if r.debug {
func (d *Driver) ConnectUDPSocket(addr, sendport, listenport string) error {
if d.debug {
fmt.Printf("ConnectUDPSocket(\"%d.%d.%d.%d\", %q, %q)\r\n", byte(addr[0]), byte(addr[1]), byte(addr[2]), byte(addr[3]), sendport, listenport)
}
socket, err := r.Rpc_lwip_socket(0x02, 0x02, 0x00)
socket, err := d.Rpc_lwip_socket(0x02, 0x02, 0x00)
if err != nil {
return err
}
r.socket = socket
r.connectionType = ConnectionTypeUDP
d.socket = socket
d.connectionType = ConnectionTypeUDP
optval := []byte{0x01, 0x00, 0x00, 0x00}
_, err = r.Rpc_lwip_setsockopt(socket, 0x00000FFF, 0x00000004, optval, uint32(len(optval)))
_, err = d.Rpc_lwip_setsockopt(socket, 0x00000FFF, 0x00000004, optval, uint32(len(optval)))
if err != nil {
return err
}
@@ -183,12 +183,12 @@ func (r *RTL8720DN) ConnectUDPSocket(addr, sendport, listenport string) error {
ip := []byte(addr)
// remote info
r.udpInfo[0] = byte(port >> 8)
r.udpInfo[1] = byte(port)
r.udpInfo[2] = ip[0]
r.udpInfo[3] = ip[1]
r.udpInfo[4] = ip[2]
r.udpInfo[5] = ip[3]
d.udpInfo[0] = byte(port >> 8)
d.udpInfo[1] = byte(port)
d.udpInfo[2] = ip[0]
d.udpInfo[3] = ip[1]
d.udpInfo[4] = ip[2]
d.udpInfo[5] = ip[3]
port, err = strconv.ParseUint(listenport, 10, 0)
if err != nil {
@@ -196,7 +196,7 @@ func (r *RTL8720DN) ConnectUDPSocket(addr, sendport, listenport string) error {
}
ip_info := make([]byte, 12)
_, err = r.Rpc_tcpip_adapter_get_ip_info(0, &ip_info)
_, err = d.Rpc_tcpip_adapter_get_ip_info(0, &ip_info)
if err != nil {
return err
}
@@ -209,12 +209,12 @@ func (r *RTL8720DN) ConnectUDPSocket(addr, sendport, listenport string) error {
name[6] = ip_info[2]
name[7] = ip_info[3]
_, err = r.Rpc_lwip_bind(socket, name, uint32(len(name)))
_, err = d.Rpc_lwip_bind(socket, name, uint32(len(name)))
if err != nil {
return err
}
_, err = r.Rpc_lwip_fcntl(socket, 0x00000004, 0x00000000)
_, err = d.Rpc_lwip_fcntl(socket, 0x00000004, 0x00000000)
if err != nil {
return err
}
@@ -222,62 +222,62 @@ func (r *RTL8720DN) ConnectUDPSocket(addr, sendport, listenport string) error {
return nil
}
func (r *RTL8720DN) DisconnectSocket() error {
if r.debug {
func (d *Driver) DisconnectSocket() error {
if d.debug {
fmt.Printf("DisconnectSocket()\r\n")
}
switch r.connectionType {
switch d.connectionType {
case ConnectionTypeTCP, ConnectionTypeUDP:
_, err := r.Rpc_lwip_close(r.socket)
_, err := d.Rpc_lwip_close(d.socket)
if err != nil {
return err
}
case ConnectionTypeTLS:
err := r.Rpc_wifi_stop_ssl_socket(r.client)
err := d.Rpc_wifi_stop_ssl_socket(d.client)
if err != nil {
return err
}
err = r.Rpc_wifi_ssl_client_destroy(r.client)
err = d.Rpc_wifi_ssl_client_destroy(d.client)
if err != nil {
return err
}
default:
}
r.connectionType = ConnectionTypeNone
d.connectionType = ConnectionTypeNone
return nil
}
func (r *RTL8720DN) StartSocketSend(size int) error {
if r.debug {
func (d *Driver) StartSocketSend(size int) error {
if d.debug {
fmt.Printf("StartSocketSend(%d)\r\n", size)
}
// No implementation required
return nil
}
func (r *RTL8720DN) Write(b []byte) (n int, err error) {
if r.debug {
func (d *Driver) Write(b []byte) (n int, err error) {
if d.debug {
fmt.Printf("Write(%#v)\r\n", b)
}
switch r.connectionType {
switch d.connectionType {
case ConnectionTypeTCP:
sn, err := r.Rpc_lwip_send(r.socket, b, 0x00000008)
sn, err := d.Rpc_lwip_send(d.socket, b, 0x00000008)
if err != nil {
return 0, err
}
n = int(sn)
case ConnectionTypeUDP:
to := []byte{0x00, 0x02, 0x0D, 0x05, 0xC0, 0xA8, 0x01, 0x76, 0xEB, 0x43, 0x00, 0x00, 0xD5, 0x27, 0x01, 0x00}
copy(to[2:], r.udpInfo[:])
sn, err := r.Rpc_lwip_sendto(r.socket, b, 0x00000000, to, uint32(len(to)))
copy(to[2:], d.udpInfo[:])
sn, err := d.Rpc_lwip_sendto(d.socket, b, 0x00000000, to, uint32(len(to)))
if err != nil {
return 0, err
}
n = int(sn)
case ConnectionTypeTLS:
sn, err := r.Rpc_wifi_send_ssl_data(r.client, b, uint16(len(b)))
sn, err := d.Rpc_wifi_send_ssl_data(d.client, b, uint16(len(b)))
if err != nil {
return 0, err
}
@@ -288,22 +288,22 @@ func (r *RTL8720DN) Write(b []byte) (n int, err error) {
return n, nil
}
func (r *RTL8720DN) ReadSocket(b []byte) (n int, err error) {
if r.debug {
func (d *Driver) ReadSocket(b []byte) (n int, err error) {
if d.debug {
//fmt.Printf("ReadSocket(b)\r\n")
}
if r.connectionType == ConnectionTypeNone {
if d.connectionType == ConnectionTypeNone {
return 0, nil
}
switch r.connectionType {
switch d.connectionType {
case ConnectionTypeTCP:
length := len(b)
if length > maxUartRecvSize-16 {
length = maxUartRecvSize - 16
}
buf := b[:length]
nn, err := r.Rpc_lwip_recv(r.socket, &buf, uint32(length), 0x00000008, 0x00002800)
nn, err := d.Rpc_lwip_recv(d.socket, &buf, uint32(length), 0x00000008, 0x00002800)
if err != nil {
return 0, err
}
@@ -311,7 +311,7 @@ func (r *RTL8720DN) ReadSocket(b []byte) (n int, err error) {
if nn == -1 {
return 0, nil
} else if nn == 0 {
return 0, r.DisconnectSocket()
return 0, d.DisconnectSocket()
}
n = int(nn)
case ConnectionTypeUDP:
@@ -322,7 +322,7 @@ func (r *RTL8720DN) ReadSocket(b []byte) (n int, err error) {
buf := b[:length]
from := make([]byte, 16)
fromLen := uint32(len(from))
nn, err := r.Rpc_lwip_recvfrom(r.socket, &buf, uint32(length), 0x00000008, &from, &fromLen, 10000)
nn, err := d.Rpc_lwip_recvfrom(d.socket, &buf, uint32(length), 0x00000008, &from, &fromLen, 10000)
if err != nil {
return 0, err
}
@@ -337,14 +337,14 @@ func (r *RTL8720DN) ReadSocket(b []byte) (n int, err error) {
length = maxUartRecvSize - 16
}
buf := b[:length]
nn, err := r.Rpc_wifi_get_ssl_receive(r.client, &buf, int32(length))
nn, err := d.Rpc_wifi_get_ssl_receive(d.client, &buf, int32(length))
if err != nil {
return 0, err
}
if nn < 0 {
return 0, fmt.Errorf("error %d", n)
} else if nn == 0 || nn == -30848 {
return 0, r.DisconnectSocket()
return 0, d.DisconnectSocket()
}
n = int(nn)
default:
@@ -353,11 +353,11 @@ func (r *RTL8720DN) ReadSocket(b []byte) (n int, err error) {
return n, nil
}
func (r *RTL8720DN) IsSocketDataAvailable() bool {
if r.debug {
func (d *Driver) IsSocketDataAvailable() bool {
if d.debug {
fmt.Printf("IsSocketDataAvailable()\r\n")
}
ret, err := r.Rpc_lwip_available(r.socket)
ret, err := d.Rpc_lwip_available(d.socket)
if err != nil {
fmt.Printf("error: %s\r\n", err.Error())
return false
@@ -368,8 +368,8 @@ func (r *RTL8720DN) IsSocketDataAvailable() bool {
return false
}
func (r *RTL8720DN) Response(timeout int) ([]byte, error) {
if r.debug {
func (d *Driver) Response(timeout int) ([]byte, error) {
if d.debug {
fmt.Printf("Response(%d))\r\n", timeout)
}
// No implementation required