github
/
AROS-v0
mirror of https://github.com/deadw00d/AROS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

# fix copyright symbols in calculator, pciusb and usb2otg. # move PCIUSB_WIP_ISO definition to uhwcmd.h, and call the stubs from the device code if defined.

This commit is contained in:
Kalamatee 2023-03-25 14:52:15 +00:00 committed by deadwood
parent 3be1c51b54
commit f78ba4cc6e
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm-native/soc/broadcom/2708/usb/usb2otg/usb2otg_core.c
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2013-2019, The AROS Development Team. All rights reserved.
Copyright (C) 2013-2023, The AROS Development Team. All rights reserved.
*/
#define DEBUG 0
@ -400,7 +400,7 @@ WORD FNAME_DEV(cmdQueryDevice)(struct IOUsbHWReq *ioreq,
if (((tag = FindTagItem(UHA_Copyright, taglist)) != NULL) && (tag->ti_Data))
{
*((STRPTR *) tag->ti_Data) ="©2013 The AROS Dev Team";
*((STRPTR *) tag->ti_Data) ="\xA9""2013-2023 The AROS Dev Team";
count++;
}

5
rom/usb/pciusb/uhwcmd.c
View File

@ -15,9 +15,6 @@
#define NewList NEWLIST
/* Uncomment to enable the W.I.P Isochornous transfer stubs */
//#define PCIUSB_WIP_ISO
/* we cannot use AROS_WORD2LE in struct initializer */
#if AROS_BIG_ENDIAN
#define WORD2LE(w) (UWORD)(((w) >> 8) & 0x00FF) | (((w) << 8) & 0xFF00)
@ -417,7 +414,7 @@ WORD cmdQueryDevice(struct IOUsbHWReq *ioreq,
}
if((tag = FindTagItem(UHA_Copyright, taglist)))
{
*((STRPTR *) tag->ti_Data) ="©2007-2009 Chris Hodges";
*((STRPTR *) tag->ti_Data) ="\xA9""2007-2009 Chris Hodges";
count++;
}
if((tag = FindTagItem(UHA_Version, taglist)))

10
rom/usb/pciusb/uhwcmd.h
View File

@ -9,6 +9,9 @@
#include "ehcichip.h"
#include "pciusb.h"
/* Uncomment to enable the W.I.P Isochornous transfer stubs */
//#define PCIUSB_WIP_ISO
#if (__WORDSIZE == 64)
APTR usbGetBuffer(APTR data, ULONG len, UWORD dir);
@ -45,6 +48,13 @@ WORD cmdBulkXFer(struct IOUsbHWReq *ioreq, struct PCIUnit *unit, struct PCIDevic
WORD cmdIntXFer(struct IOUsbHWReq *ioreq, struct PCIUnit *unit, struct PCIDevice *base);
WORD cmdIsoXFer(struct IOUsbHWReq *ioreq, struct PCIUnit *unit, struct PCIDevice *base);
#if defined(PCIUSB_WIP_ISO)
WORD cmdAddIsoHandler(struct IOUsbHWReq *ioreq, struct PCIUnit *unit, struct PCIDevice *base);
WORD cmdRemIsoHandler(struct IOUsbHWReq *ioreq, struct PCIUnit *unit, struct PCIDevice *base);
WORD cmdStartRTIso(struct IOUsbHWReq *ioreq, struct PCIUnit *unit, struct PCIDevice *base);
WORD cmdStopRTIso(struct IOUsbHWReq *ioreq, struct PCIUnit *unit, struct PCIDevice *base);
#endif
WORD cmdFlush(struct IOUsbHWReq *ioreq, struct PCIUnit *unit, struct PCIDevice *base);
WORD cmdNSDeviceQuery(struct IOStdReq *ioreq, struct PCIUnit *unit, struct PCIDevice *base);

4
workbench/tools/Calculator.c
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 1995-2018, The AROS Development Team. All rights reserved.
Copyright (C) 1995-2023, The AROS Development Team. All rights reserved.
Command line options:
1. PUBSCREEN <name>: the name of the public screen to open the window on
@ -689,7 +689,7 @@ int main(void)
app = ApplicationObject,
MUIA_Application_Title, "Calculator",
MUIA_Application_Version, "1.5",
MUIA_Application_Copyright, "©2007-2018, AROS Dev Team",
MUIA_Application_Copyright, "\xA9""2007-2023, AROS Dev Team",
MUIA_Application_Author, "AROS Team",
MUIA_Application_Description, "Simple desktop calculator",
MUIA_Application_Base, "calculator",