Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

driver interface to OS implemented and tested

Browse Source
This commit is contained in:
Markus Fröschle
2013-12-22 14:16:59 +00:00
parent c6e5540ee3
commit 94ff279838
22 changed files with 704 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
BaS_gcc/usb/usb.c
View File

@@ -56,7 +56,7 @@
extern int usb_stor_curr_dev;
extern uint32_t usb_1st_disk_drive;
#define USB_DEBUG
//#define USB_DEBUG
#ifdef USB_DEBUG
#define debug_printf(fmt, args...) xprintf(fmt , ##args)
@@ -121,13 +121,13 @@ int usb_init(int32_t handle, const struct pci_device_id *ent)
asynch_allowed = 1;
if (handle && (ent != NULL))
{
if (usb_mem_init())
if (driver_mem_init())
{
usb_started = 0;
return -1; /* out of memoy */
}
if (usb_dev == NULL)
usb_dev = (struct usb_device *)usb_malloc(sizeof(struct usb_device) * USB_MAX_BUS * USB_MAX_DEVICE);
usb_dev = (struct usb_device *) driver_mem_alloc(sizeof(struct usb_device) * USB_MAX_BUS * USB_MAX_DEVICE);
if (usb_dev == NULL)
{
usb_started = 0;
@@ -174,7 +174,7 @@ int usb_init(int32_t handle, const struct pci_device_id *ent)
/* if lowlevel init is OK, scan the bus for devices
* i.e. search HUBs and configure them */
if (setup_packet == NULL)
setup_packet = (void *)usb_malloc(sizeof(struct devrequest));
setup_packet = (void *)driver_mem_alloc(sizeof(struct devrequest));
if (setup_packet == NULL)
{
usb_started = 0;
@@ -207,7 +207,7 @@ int usb_stop(void)
asynch_allowed = 1;
usb_started = 0;
usb_hub_reset(bus_index);
usb_free(setup_packet);
driver_mem_free(setup_packet);
for (i = 0; i < USB_MAX_BUS; i++)
{
struct hci *priv = controller_priv[i];
@@ -234,7 +234,7 @@ int usb_stop(void)
}
}
bus_index = 0;
usb_mem_stop();
driver_mem_stop();
}
return res;
}
@@ -767,7 +767,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
if (size <= 0 || !buf || !index)
return -1;
buf[0] = 0;
tbuf = (unsigned char *)usb_malloc(USB_BUFSIZ);
tbuf = (unsigned char *)driver_mem_alloc(USB_BUFSIZ);
if (tbuf == NULL)
{
debug_printf("usb_string: malloc failure\r\n");
@@ -780,13 +780,13 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
if (err < 0)
{
debug_printf("error getting string descriptor 0 (error=%lx)\r\n", dev->status);
usb_free(tbuf);
driver_mem_free(tbuf);
return -1;
}
else if (tbuf[0] < 4)
{
debug_printf("string descriptor 0 too short\r\n");
usb_free(tbuf);
driver_mem_free(tbuf);
return -1;
}
else
@@ -800,7 +800,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
err = usb_string_sub(dev, dev->string_langid, index, tbuf);
if (err < 0)
{
usb_free(tbuf);
driver_mem_free(tbuf);
return err;
}
size--; /* leave room for trailing NULL char in output buffer */
@@ -815,7 +815,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
}
buf[idx] = 0;
err = idx;
usb_free(tbuf);
driver_mem_free(tbuf);
return err;
}
@@ -926,7 +926,7 @@ int usb_new_device(struct usb_device *dev)
addr = dev->devnum;
dev->devnum = 0;
tmpbuf = (unsigned char *) usb_malloc(USB_BUFSIZ);
tmpbuf = (unsigned char *) driver_mem_alloc(USB_BUFSIZ);
if (tmpbuf == NULL)
{
debug_printf("usb_new_device: malloc failure\r\n");
@@ -947,7 +947,7 @@ int usb_new_device(struct usb_device *dev)
if (err < 8)
{
debug_printf("\r\nUSB device not responding, giving up (status=%lX)\r\n", dev->status);
usb_free(tmpbuf);
driver_mem_free(tmpbuf);
return 1;
}
#else
@@ -972,7 +972,7 @@ int usb_new_device(struct usb_device *dev)
if (err < 0)
{
debug_printf("usb_new_device: usb_get_descriptor() failed\r\n");
usb_free(tmpbuf);
driver_mem_free(tmpbuf);
return 1;
}
dev->descriptor.bMaxPacketSize0 = desc->bMaxPacketSize0;
@@ -992,7 +992,7 @@ int usb_new_device(struct usb_device *dev)
if (port < 0)
{
debug_printf("usb_new_device: cannot locate device's port.\r\n");
usb_free(tmpbuf);
driver_mem_free(tmpbuf);
return 1;
}
/* reset the port for the second time */
@@ -1000,7 +1000,7 @@ int usb_new_device(struct usb_device *dev)
if (err < 0)
{
debug_printf("\r\nCouldn't reset port %d\r\n", port);
usb_free(tmpbuf);
driver_mem_free(tmpbuf);
return 1;
}
}
@@ -1019,7 +1019,7 @@ int usb_new_device(struct usb_device *dev)
if (err < 0)
{
debug_printf("\r\nUSB device not accepting new address (error=%lX)\r\n", dev->status);
usb_free(tmpbuf);
driver_mem_free(tmpbuf);
return 1;
}
wait(10 * 1000); /* Let the SET_ADDRESS settle */
@@ -1031,7 +1031,7 @@ int usb_new_device(struct usb_device *dev)
debug_printf("unable to get device descriptor (error=%d)\r\n", err);
else
debug_printf("USB device descriptor short read (expected %i, got %i)\r\n", tmp, err);
usb_free(tmpbuf);
driver_mem_free(tmpbuf);
return 1;
}
/* correct le values */
@@ -1047,7 +1047,7 @@ int usb_new_device(struct usb_device *dev)
if (usb_set_configuration(dev, dev->config.bConfigurationValue))
{
debug_printf("failed to set default configuration len %d, status %lX\r\n", dev->act_len, dev->status);
usb_free(tmpbuf);
driver_mem_free(tmpbuf);
return -1;
}
debug_printf("new device strings: Mfr=%d, Product=%d, SerialNumber=%d\r\n",
@@ -1067,7 +1067,7 @@ int usb_new_device(struct usb_device *dev)
debug_printf("SerialNumber %s\r\n", dev->serial);
/* now prode if the device is a hub */
usb_hub_probe(dev, 0);
usb_free(tmpbuf);
driver_mem_free(tmpbuf);
return 0;
}
@@ -1117,7 +1117,7 @@ void usb_scan_devices(void *priv)
* Probes device for being a hub and configurate it
*/
#define USB_HUB_DEBUG
//#define USB_HUB_DEBUG
#ifdef USB_HUB_DEBUG
#define dbg_hub(fmt, args...) xprintf(fmt , ##args)
@@ -1462,7 +1462,7 @@ int usb_hub_configure(struct usb_device *dev)
if (hub == NULL)
return -1;
hub->pusb_dev = dev;
buffer = (unsigned char *)usb_malloc(USB_BUFSIZ);
buffer = (unsigned char *)driver_mem_alloc(USB_BUFSIZ);
if (buffer == NULL)
{
dbg_hub("usb_hub_configure: malloc failure\r\n");
@@ -1472,7 +1472,7 @@ int usb_hub_configure(struct usb_device *dev)
if (usb_get_hub_descriptor(dev, buffer, 4) < 0)
{
dbg_hub("usb_hub_configure: failed to get hub descriptor, giving up %lX\r\n", dev->status);
usb_free(buffer);
driver_mem_free(buffer);
return -1;
}
dbg_hub("bLength:%02X bDescriptorType:%02X bNbrPorts:%02X\r\n", buffer[0], buffer[1], buffer[2]);
@@ -1482,13 +1482,13 @@ int usb_hub_configure(struct usb_device *dev)
if (i > USB_BUFSIZ)
{
dbg_hub("usb_hub_configure: failed to get hub descriptor - too long: %d\r\n", descriptor->bLength);
usb_free(buffer);
driver_mem_free(buffer);
return -1;
}
if (usb_get_hub_descriptor(dev, buffer, descriptor->bLength) < 0)
{
dbg_hub("usb_hub_configure: failed to get hub descriptor 2nd giving up %lX\r\n", dev->status);
usb_free(buffer);
driver_mem_free(buffer);
return -1;
}
memcpy((unsigned char *)&hub->desc, buffer, descriptor->bLength);
@@ -1539,13 +1539,13 @@ int usb_hub_configure(struct usb_device *dev)
if (sizeof(struct usb_hub_status) > USB_BUFSIZ)
{
dbg_hub("usb_hub_configure: failed to get Status - too long: %d\r\n", descriptor->bLength);
usb_free(buffer);
driver_mem_free(buffer);
return -1;
}
if (usb_get_hub_status(dev, buffer) < 0)
{
dbg_hub("usb_hub_configure: failed to get Status %lX\r\n", dev->status);
usb_free(buffer);
driver_mem_free(buffer);
return -1;
}
@@ -1583,7 +1583,7 @@ int usb_hub_configure(struct usb_device *dev)
if (queue_poll_hub == NULL)
#endif
usb_hub_events(dev);
usb_free(buffer);
driver_mem_free(buffer);
return 0;
}

136
BaS_gcc/usb/usb_mem.c
View File

@@ -1,5 +1,5 @@
/*
* usb_mem.c
* driver_mem.c
*
* based from Emutos / BDOS
*
@@ -30,18 +30,18 @@
#define TRUE 1
#endif
#undef USB_MEM_DEBUG
#undef DRIVER_MEM_DEBUG
#ifdef USB_MEM_DEBUG
#define USB_MEM_PRINTF(fmt, args...) xprintf(fmt, ##args)
#ifdef DRIVER_MEM_DEBUG
#define dbg(fmt, args...) xprintf(fmt, ##args)
#else
#define USB_MEM_PRINTF(fmt, args...)
#define dbg(fmt, args...)
#endif
extern void *info_fvdi;
extern long offscren_reserved(void);
extern uint8_t usb_buffer[USB_BUFFER_SIZE]; /* defined in linker control file */
extern uint8_t driver_mem[DRIVER_MEM_SIZE]; /* defined in linker control file */
/* MD - Memory Descriptor */
@@ -74,7 +74,8 @@ static MPB pmd;
static void *xmgetblk(void)
{
int i;
for(i = 0; i < MAXMD; i++)
for (i = 0; i < MAXMD; i++)
{
if (tab_md[i].m_own == NULL)
{
@@ -82,14 +83,16 @@ static void *xmgetblk(void)
return(&tab_md[i]);
}
}
return(NULL);
return NULL;
}
static void xmfreblk(void *m)
{
int i = (int)(((long)m - (long)tab_md) / sizeof(MD));
int i = (int)(((long) m - (long) tab_md) / sizeof(MD));
if ((i > 0) && (i < MAXMD))
{
tab_md[i].m_own = NULL;
}
}
static MD *ffit(long amount, MPB *mp)
@@ -97,13 +100,18 @@ static MD *ffit(long amount, MPB *mp)
MD *p, *q, *p1; /* free list is composed of MD's */
int maxflg;
long maxval;
if (amount != -1)
{
amount += 15; /* 16 bytes alignment */
amount &= 0xFFFFFFF0;
}
if ((q = mp->mp_rover) == 0) /* get rotating pointer */
return(0) ;
{
return 0;
}
maxval = 0;
maxflg = ((amount == -1) ? TRUE : FALSE) ;
p = q->m_link; /* start with next MD */
@@ -119,14 +127,21 @@ static MD *ffit(long amount, MPB *mp)
{
/* big enough */
if (p->m_length == amount)
{
q->m_link = p->m_link; /* take the whole thing */
}
else
{
/* break it up - 1st allocate a new
MD to describe the remainder */
/*
* break it up - 1st allocate a new
* MD to describe the remainder
*/
p1 = xmgetblk();
if (p1 == NULL)
{
return(NULL);
}
/* init new MD */
p1->m_length = p->m_length - amount;
p1->m_start = p->m_start + amount;
@@ -144,16 +159,22 @@ static MD *ffit(long amount, MPB *mp)
else if (p->m_length > maxval)
maxval = p->m_length;
p = ( q=p )->m_link;
}
while(q != mp->mp_rover);
/* return either the max, or 0 (error) */
} while(q != mp->mp_rover);
/*
* return either the max, or 0 (error)
*/
if (maxflg)
{
maxval -= 15; /* 16 bytes alignment */
maxval -= 15; /* 16 bytes alignment */
if (maxval < 0)
{
maxval = 0;
}
else
{
maxval &= 0xFFFFFFF0;
}
}
return(maxflg ? (MD *) maxval : 0);
}
@@ -161,84 +182,123 @@ static MD *ffit(long amount, MPB *mp)
static void freeit(MD *m, MPB *mp)
{
MD *p, *q;
q = 0;
for(p = mp->mp_mfl; p ; p = (q=p) -> m_link)
for (p = mp->mp_mfl; p ; p = (q = p) -> m_link)
{
if (m->m_start <= p->m_start)
{
break;
}
}
m->m_link = p;
if (q)
{
q->m_link = m;
}
else
{
mp->mp_mfl = m;
}
if (!mp->mp_rover)
{
mp->mp_rover = m;
}
if (p)
{
if (m->m_start + m->m_length == p->m_start)
{ /* join to higher neighbor */
{
/* join to higher neighbor */
m->m_length += p->m_length;
m->m_link = p->m_link;
if (p == mp->mp_rover)
{
mp->mp_rover = m;
}
xmfreblk(p);
}
}
if (q)
{
if (q->m_start + q->m_length == m->m_start)
{ /* join to lower neighbor */
{
/* join to lower neighbor */
q->m_length += m->m_length;
q->m_link = m->m_link;
if (m == mp->mp_rover)
{
mp->mp_rover = q;
}
xmfreblk(m);
}
}
}
int usb_free(void *addr)
int driver_mem_free(void *addr)
{
int level;
MD *p, **q;
MPB *mpb;
mpb = &pmd;
level = set_ipl(7);
for(p = *(q = &mpb->mp_mal); p; p = *(q = &p->m_link))
{
if ((long)addr == p->m_start)
if ((long) addr == p->m_start)
{
break;
}
}
if (!p)
{
set_ipl(level);
return(-1);
}
*q = p->m_link;
freeit(p, mpb);
set_ipl(level);
USB_MEM_PRINTF("usb_free(0x%08X)\r\n", addr);
dbg("driver_mem_free(0x%08X)\r\n", addr);
return(0);
}
void *usb_malloc(long amount)
void *driver_mem_alloc(long amount)
{
void *ret = NULL;
int level;
MD *m;
if (amount == -1L)
{
return((void *)ffit(-1L, &pmd));
}
if (amount <= 0 )
{
return(0);
}
if ((amount & 1))
{
amount++;
}
level = set_ipl(7);
m = ffit(amount, &pmd);
if (m != NULL)
{
ret = (void *)m->m_start;
}
set_ipl(level);
USB_MEM_PRINTF("usb_malloc(%d) = 0x%08X\r\n", amount, ret);
dbg("driver_mem_alloc(%d) = 0x%08X\r\n", amount, ret);
return(ret);
}
@@ -247,21 +307,25 @@ void *usb_malloc(long amount)
int usb_mem_init(void)
{
#ifdef USE_RADEON_MEMORY
usb_buffer = (void *)offscren_reserved();
if (usb_buffer == NULL)
driver_mem_buffer = (void *) offscren_reserved();
if (driver_mem_buffer == NULL)
#endif
memset(usb_buffer, 0, USB_BUFFER_SIZE);
memset(driver_mem_buffer, 0, DRIVER_MEM_BUFFER_SIZE);
if (usb_buffer == NULL)
if (driver_mem_buffer == NULL)
{
return(-1);
}
pmd.mp_mfl = pmd.mp_rover = &tab_md[0];
tab_md[0].m_link = (MD *)NULL;
tab_md[0].m_start = ((long)usb_buffer + 15) & ~15;
tab_md[0].m_length = USB_BUFFER_SIZE;
tab_md[0].m_own = (void *)1L;
pmd.mp_mal = (MD *)NULL;
memset(usb_buffer, 0, tab_md[0].m_length);
USB_MEM_PRINTF("USB malloc buffer at 0x%08X size %d\r\n", tab_md[0].m_start, tab_md[0].m_length);
tab_md[0].m_link = (MD *) NULL;
tab_md[0].m_start = ((long) driver_mem_buffer + 15) & ~15;
tab_md[0].m_length = DRIVER_MEM_BUFFER_SIZE;
tab_md[0].m_own = (void *) 1L;
pmd.mp_mal = (MD *) NULL;
memset(driver_mem_buffer, 0, tab_md[0].m_length);
dbg("driver memory buffer at 0x%08X size %d\r\n", tab_md[0].m_start, tab_md[0].m_length);
return(0);
}
@@ -269,7 +333,7 @@ void usb_mem_stop(void)
{
#ifndef CONFIG_USB_MEM_NO_CACHE
#ifdef USE_RADEON_MEMORY
if (usb_buffer == (void *)offscren_reserved())
if (driver_mem_buffer == (void *) offscren_reserved())
return;
#endif
#endif

9
BaS_gcc/usb/usb_mouse.c
View File

@@ -24,6 +24,7 @@
#include "bas_printf.h"
#include "usb.h"
#include "exceptions.h"
#include "driver_mem.h"
#undef USB_MOUSE_DEBUG
#ifdef USB_MOUSE_DEBUG
@@ -49,7 +50,7 @@ int usb_mouse_deregister(struct usb_device *dev)
dev->irq_handle = NULL;
if(new != NULL)
{
usb_free(new);
driver_mem_free(new);
new = NULL;
}
mouse_installed = 0;
@@ -83,9 +84,9 @@ int drv_usb_mouse_init(void)
for(i = 0; i < USB_MAX_DEVICE; i++)
{
struct usb_device *dev = usb_get_dev_index(i, j); /* get device */
if(dev == NULL)
if (dev == NULL)
break;
if(usb_mouse_register(dev) > 0)
if (usb_mouse_register(dev) > 0)
return 1;
}
}
@@ -212,7 +213,7 @@ static int usb_mouse_probe(struct usb_device *dev, unsigned int ifnum)
return 0;
if((ep->bmAttributes & 3) != 3)
return 0;
new = (unsigned char *)usb_malloc(8);
new = (unsigned char *)driver_mem_alloc(8);
if(new == NULL)
return 0;
mse_printf("USB MOUSE found set protocol...\r\n");